Removed the unnecessary classes

Remove pools, as I've misunderstood their purpose.
Continued work on map.