Folder refactoring and first ugly map.