Modified some directories, added 2d array
Refactored map to seperate class