Put each class in its own file for clarity