Revert "Relocation of files to folders"

This reverts commit 2a786d2a90e8410f16af0ded84237379b2861c56.