moving a class to the core instead of common