Move roles to entity directory