Moved dispatcher to it own package and cleared up some things