Revert "Entity and subclasses"

This reverts commit f3c663f5c6c6f3fbc69ac6ba1120a66d478efb6b.