Entity API updates part 2
Moves hanging entities into new package
Updates EntityFactory and EntityType a bit as well