moved entities to own package