Moved grouprouter to own file