Moved a few things around to make general maintenance easier.
Closes #189 (closed)
This will create a new commit in order to revert the existing changes.
