Break entity code into separate namespace