Revert "first round of refactoring"
Merge pull request #2 from kylophone/revert-1-master

Revert "first round of refactoring"