namespace and directory fix