Refactor EppDomain to subdir