Changed filenames; removed windows.h dependency