Remove some hardcoded URLs and added namespacing to URLs