- Started separating code into its own files and classes