removed domain classes from core package