maps folder refactored