Refactoring

> Originally at https://github.com/kevin-brown/mousetrap/pull/1

This is the pull request that will be used for code review, tracking progress, and eventually generating the patch set for this refactoring.
For some reason, when running this on a fresh install (never ran old installer), this directory does not exist when this command is run, so an error is raised and the installer fails.