Changed the file structure and added map objects