Updated require references to point to new files