Refactor the codes and update attributions for new files

2 jobs for !357 with indexing_virtual_properties in 60 minutes and 27 seconds (queued for 1 second)
merge request