Merge pull request #3 from jacobwagner/master

cleaned up namespaces, refactored some classes for readability/modularit...