Moved some classes back to core package as they depend on it too much.