Changes to file names & structure, as requested (though my github still shows the old file name)