Fixed build script to work with the new folder structure