Renamed some files  and eliminated debug system.out