fix typo
remove non-debug print statement
re-org code into multiple files, main file was getting unmanageable
Merge remote-tracking branch 'upstream/master'