I created new files for my different classes and did your suggestions