DDF-463 Refactored all the handlers to their own directory.
DDF-463 Continued refactoring and cleanup.