implemented namespaces and started layout of entity class