Agile Lab# 4 -  Cleanup.

Further abstraction and cleanup of entities and data management classes.