Deleted entities subpackage and moved classes out into parent package.