* Modified SCONS files to be more modular