Refactored code into separate files.  Things are working too!