refactoring
moved data classes from core package to core.data package