housecleaning, renaming, and better structure for the program begins
better named files