Refactor:  move file around and fix the require