Re-committing base entity class

Base entity class for 2D entities.