moved entity files to its own package