fix file path and namespace