updated namespaces for entity classes
fleshed out entity objects