minor fixes

move source to standard source location and fix a couple of compilation errors