standardize file names, fix guard macros, change conf/log file names
comments from 2013-01-10 meeting