Renamed Entities/ folder to Entity/
Removed old tests
Numerous updates
Updated util tests
Updated tests
Updated tests