changed directory structure, and correspondingly the SCons files