Refactored code to move classes out to separate file. Includes functionality for #7.