Renamed maps, redid main, added constants to separate file