Moved routing to lib. Correct routing for existing menu items.