Folder changes needed for the new toolchain system