Moved entities to new package