Refactored code a bit.

started with namespacing URLs.