Moved non-entity classes from entities namespace