Reorganized handler packages; removed unnecessary handler constructors; started refactoring for Guice.