Moving a class to the common directory