Reverted domain classes back into the domain package.