Commit before big modification

Refactory in gen* map and obstacles