Massive refactoring of folders (again)