Move dispatcher stuff into its own directory
Reorganize a bunch of things