renamed paths to rid all the ubiquo namespacing