change package name to command-dispatcher/command-dispatcher, move
things around a bit