Some file housekeeping

Changed names of some files and deleted some others