Fixed some bugs

Fixed map not alligning with coordinates
Fixed issues with compiling after splitting into multiple files