New map generation project, cleaner and better code