Correct conditional compilation & move logger source files to correct place