Instead of storing everything units and building seperated, it would be great to store them in a single Tile class.