Move dto and enums to models