Restructuring the build scripts/files