Fixed unused imports.
Moved EntityPackage to it's own class.