move classes to core package