Metadata Module Tidyup

Spotted two classed in the Nancy.Routing namespace that should have got moved in the refactor to move the metadata module stuff into a separate project. This PR cleans those up by moving them to the new project.