Folder organisation refactoring