remove some hardcoded paths and remove the empty namespace thing