added types to EntityTable fields
made package structure more shallow
added test class for entity table