Replace files and fix sconscript