move the subentity to entity file