domain refactoring (pita)