Renamed files and commented out debug messages.