Naming/directory changes

Also fixed style on map and menu