namespace and file location cleanup