Moved each class to its own separate file