merge Judy's changes and restore proper file location

Should clean up the last PR Judy made.