cleanup and arrange domain classes