Fixed the build scripts for the new structure.