Move files to correct locations and rename where appropriate

I have also rewritten part of a routing spec as it differed to the Relish documentation. Happy to discuss.