first map and some folder refactoring