Moved includes off into their own directory.
Refactored mail handlers, added tests.