FW-277. FW-278. Fixing SCons build environment after moving files around.