Converting to collection

Simone Spinellirequested to merge
converting_to_collection into develop

Move folder structure to something that works for collections

Merge request reports