Renamed, removed extraneous files