Reorganized the project into 3 files so that we can better multitask