Trying to place each class in its own file