Fixes for restructuring
Removing spare prints
Removing spare prints
Merge pull request #58 from captdeaf/master

Fixes for Tim's restructuring.