4 - Reorganize objects
6 - Adding id fields and source format
6 - Creating util classes for Treasure and Location objects