Edit namespace and some files