Fix more path names to point to the new module