Removed Dispatcher Router, Moved to Own Package