moved classes into package ENTITIES