Rearranging file structure and reusing map_data methods