Created new classes and files, and separated the methods as needed. No functionality