Moved entities to separate namespace