re-organize handlers

This should make it easier to extend / change the base handlers in other projects. Thoughts?