Moved entity to its own package