Moved classes in common to core