Renamed some files
Renamed some debugging functions
Fixed whitespace and CR/LF issues