Added map manager. Project cleaning