diff --git a/Linux-Builds/bin/build/build_ce b/Linux-Builds/bin/build/build_ce
index d45333f..71b1746 100755
--- a/Linux-Builds/bin/build/build_ce
+++ b/Linux-Builds/bin/build/build_ce
@@ -1,3 +1,20 @@
 #!/bin/bash
 
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DCHECK_GIT_TAG=0  -DUSE_LIBXSLT=ON -DXALAN_LIBRARIES= -DUSE_LIBARCHIVE=false -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF ../HPCC-Platform
+curDir=$(dirname $0)
+scriptName=$(basename $0)
+cmakeOptions=${scriptName}_cmake_options
+[ ! -e ${curDir}/${CODENAME}/${cmakeOptions} ] && exit 1
+. ${curDir}/${CODENAME}/${cmakeOptions} 
+. ${curDir}/build_common
+. ${curDir}/build_common_${PKG_TYPE}
+
+echo "cmake -DCMAKE_BUILD_TYPE=Release  -DCHECK_GIT_TAG=1 -DUSE_LIBARCHIVE=false -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS} ../HPCC-Platform" 
+cmake  -DCMAKE_BUILD_TYPE=Release  -DCHECK_GIT_TAG=1 -DUSE_LIBARCHIVE=false -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS} ../HPCC-Platform || exit 1
+
+build_package || exit 1
+
+[ "$PKG_TYPE" = "deb" ] && fix_deb HPCC-Platform
+
+copy_package
+
+
diff --git a/Linux-Builds/bin/build/build_ce_wp b/Linux-Builds/bin/build/build_ce_wp
index 3404b0b..283d233 100755
--- a/Linux-Builds/bin/build/build_ce_wp
+++ b/Linux-Builds/bin/build/build_ce_wp
@@ -1,3 +1,20 @@
 #!/bin/bash
 
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DCHECK_GIT_TAG=0   ../HPCC-Platform
+curDir=$(dirname $0)
+scriptName=$(basename $0)
+cmakeOptions=${scriptName}_cmake_options
+[ ! -e ${curDir}/${CODENAME}/${cmakeOptions} ] && exit 1
+. ${curDir}/${CODENAME}/${cmakeOptions} 
+. ${curDir}/build_common
+. ${curDir}/build_common_${PKG_TYPE}
+
+echo "cmake -DCMAKE_BUILD_TYPE=Release  -DCHECK_GIT_TAG=1 ${CMAKE_OPTIONS} ../HPCC-Platform" 
+cmake -DCMAKE_BUILD_TYPE=Release  -DCHECK_GIT_TAG=1 ${CMAKE_OPTIONS} ../HPCC-Platform || exit 1
+
+build_package || exit 1
+
+[ "$PKG_TYPE" = "deb" ] && fix_deb HPCC-Platform
+
+copy_package
+
+
diff --git a/Linux-Builds/bin/build/build_ct b/Linux-Builds/bin/build/build_ct
index d664f8a..9a2b158 100755
--- a/Linux-Builds/bin/build/build_ct
+++ b/Linux-Builds/bin/build/build_ct
@@ -1,8 +1,20 @@
-#cd build
+#!/bin/bash
 
-#/usr/local/bin/cmake ../$1 -DUSE_LIBXSLT=ON -DXALAN_LIBRARIES= 
+curDir=$(dirname $0)
+scriptName=$(basename $0)
+cmakeOptions=${scriptName}_cmake_options
+[ ! -e ${curDir}/${CODENAME}/${cmakeOptions} ] && exit 1
+. ${curDir}/${CODENAME}/${cmakeOptions} 
+. ${curDir}/build_common
+. ${curDir}/build_common_${PKG_TYPE}
+
+echo "/usr/local/bin/cmake ../HPCC-Platform -DCHECK_GIT_TAG=0 -DCLIENTTOOLS_ONLY=ON -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS}"
+/usr/local/bin/cmake ../HPCC-Platform -DCHECK_GIT_TAG=0 -DCLIENTTOOLS_ONLY=ON -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS} || exit 1
+
+build_package || exit 1
+
+[ "$PKG_TYPE" = "deb" ] && fix_deb HPCC-Platform
+
+copy_package
 
-/usr/local/bin/cmake ../HPCC-Platform -DCLIENTTOOLS_ONLY=ON -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF
 
-#make
-#make package
diff --git a/Linux-Builds/bin/build/build_dc b/Linux-Builds/bin/build/build_dc
index ee696d4..f9a7407 100755
--- a/Linux-Builds/bin/build/build_dc
+++ b/Linux-Builds/bin/build/build_dc
@@ -1,4 +1,18 @@
-#cd build
+#!/bin/bash
+
+curDir=$(dirname $0)
+scriptName=$(basename $0)
+cmakeOptions=${scriptName}_cmake_options
+[ ! -e ${curDir}/${CODENAME}/${cmakeOptions} ] && exit 1
+. ${curDir}/${CODENAME}/${cmakeOptions} 
+. ${curDir}/build_common
+. ${curDir}/build_common_${PKG_TYPE}
+
+echo "cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Release  -DCHECK_GIT_TAG=0 -DMAKE_DOCS_ONLY=ON -DUSE_NATIVE_LIBRARIES=ON ${CMAKE_OPTIONS} ../HPCC-Platform" 
+cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DCHECK_GIT_TAG=0 -DMAKE_DOCS_ONLY=ON -DUSE_NATIVE_LIBRARIES=ON ${CMAKE_OPTIONS} ../HPCC-Platform || exit 1
+
+make -j4 || exit 1
+
+copy_docs
 
-/usr/local/bin/cmake ../HPCC-Platform -DMAKE_DOCS_ONLY=ON -DUSE_NATIVE_LIBRARIES=ON
 
diff --git a/Linux-Builds/bin/build/build_ee b/Linux-Builds/bin/build/build_ee
index b5ef033..e8f8b69 100755
--- a/Linux-Builds/bin/build/build_ee
+++ b/Linux-Builds/bin/build/build_ee
@@ -1,3 +1,20 @@
 #!/bin/bash
 
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=0 -DUSE_LIBXSLT=ON -DXALAN_LIBRARIES= -DUSE_LIBARCHIVE=false -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF ../LN
+curDir=$(dirname $0)
+scriptName=$(basename $0)
+cmakeOptions=${scriptName}_cmake_options
+[ ! -e ${curDir}/${CODENAME}/${cmakeOptions} ] && exit 1
+. ${curDir}/${CODENAME}/${cmakeOptions} 
+. ${curDir}/build_common
+. ${curDir}/build_common_${PKG_TYPE}
+
+echo "cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=1 -DUSE_LIBARCHIVE=false -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS} ../HPCC-Platform" 
+cmake  -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=1 -DUSE_LIBARCHIVE=false -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS} ../HPCC-Platform || exit 1
+
+build_package || exit 1
+
+[ "$PKG_TYPE" = "deb" ] && fix_deb HPCC-Platform
+
+copy_package
+
+
diff --git a/Linux-Builds/bin/build/build_ee_wp b/Linux-Builds/bin/build/build_ee_wp
index ece4ec3..7321182 100755
--- a/Linux-Builds/bin/build/build_ee_wp
+++ b/Linux-Builds/bin/build/build_ee_wp
@@ -1,5 +1,20 @@
 #!/bin/bash
 
-#cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=0 -DCMAKE_CXX_FLAGS="-D_DALIUSER_STACKTRACE" -DUSE_LIBXSLT=ON -DXALAN_LIBRARIES= ../LN
+curDir=$(dirname $0)
+scriptName=$(basename $0)
+cmakeOptions=${scriptName}_cmake_options
+[ ! -e ${curDir}/${CODENAME}/${cmakeOptions} ] && exit 1
+. ${curDir}/${CODENAME}/${cmakeOptions} 
+. ${curDir}/build_common
+. ${curDir}/build_common_${PKG_TYPE}
+
+echo "cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS=-D_DALIUSER_STACKTRACE ${CMAKE_OPTIONS} ../HPCC-Platform" 
+cmake  -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS="-D_DALIUSER_STACKTRACE" ${CMAKE_OPTIONS} ../HPCC-Platform || exit 1
+
+build_package || exit 1
+
+[ "$PKG_TYPE" = "deb" ] && fix_deb HPCC-Platform
+
+copy_package
+
 
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=0  ../LN
diff --git a/Linux-Builds/bin/build/build_ln b/Linux-Builds/bin/build/build_ln
index 4fb3a42..5f12cc8 100755
--- a/Linux-Builds/bin/build/build_ln
+++ b/Linux-Builds/bin/build/build_ln
@@ -1,3 +1,20 @@
 #!/bin/bash
 
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=0  -DUSE_LIBARCHIVE=false -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF ../LN
+curDir=$(dirname $0)
+scriptName=$(basename $0)
+cmakeOptions=${scriptName}_cmake_options
+[ ! -e ${curDir}/${CODENAME}/${cmakeOptions} ] && exit 1
+. ${curDir}/${CODENAME}/${cmakeOptions} 
+. ${curDir}/build_common
+. ${curDir}/build_common_${PKG_TYPE}
+
+echo "cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS=-D_DALIUSER_STACKTRACE  -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS} ../HPCC-Platform" 
+cmake  -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS="-D_DALIUSER_STACKTRACE"  -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS} ../HPCC-Platform || exit 1
+
+build_package || exit 1
+
+[ "$PKG_TYPE" = "deb" ] && fix_deb HPCC-Platform
+
+copy_package
+
+
diff --git a/Linux-Builds/bin/build/build_ln_wp b/Linux-Builds/bin/build/build_ln_wp
index 3a173bf..2aa31d6 100755
--- a/Linux-Builds/bin/build/build_ln_wp
+++ b/Linux-Builds/bin/build/build_ln_wp
@@ -1,5 +1,20 @@
 #!/bin/bash
 
-#cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=0 -DCMAKE_CXX_FLAGS="-D_DALIUSER_STACKTRACE" -DUSE_LIBXSLT=ON -DXALAN_LIBRARIES= ../LN
+curDir=$(dirname $0)
+scriptName=$(basename $0)
+cmakeOptions=${scriptName}_cmake_options
+[ ! -e ${curDir}/${CODENAME}/${cmakeOptions} ] && exit 1
+. ${curDir}/${CODENAME}/${cmakeOptions} 
+. ${curDir}/build_common
+. ${curDir}/build_common_${PKG_TYPE}
+
+echo "cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS=-D_DALIUSER_STACKTRACE ${CMAKE_OPTIONS} ../HPCC-Platform" 
+cmake  -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS="-D_DALIUSER_STACKTRACE" ${CMAKE_OPTIONS} ../HPCC-Platform || exit 1
+
+build_package || exit 1
+
+[ "$PKG_TYPE" = "deb" ] && fix_deb HPCC-Platform
+
+copy_package
+
 
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=0  ../LN
diff --git a/Linux-Builds/bin/build/el6/build_ce b/Linux-Builds/bin/build/el6/build_ce
deleted file mode 100755
index d45333f..0000000
--- a/Linux-Builds/bin/build/el6/build_ce
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DCHECK_GIT_TAG=0  -DUSE_LIBXSLT=ON -DXALAN_LIBRARIES= -DUSE_LIBARCHIVE=false -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF ../HPCC-Platform
diff --git a/Linux-Builds/bin/build/el6/build_ce_wp b/Linux-Builds/bin/build/el6/build_ce_wp
deleted file mode 100755
index 8d47da7..0000000
--- a/Linux-Builds/bin/build/el6/build_ce_wp
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DCHECK_GIT_TAG=0 -DUSE_LIBXSLT=ON ../HPCC-Platform
diff --git a/Linux-Builds/bin/build/el6/build_clienttools b/Linux-Builds/bin/build/el6/build_clienttools
deleted file mode 100755
index d664f8a..0000000
--- a/Linux-Builds/bin/build/el6/build_clienttools
+++ /dev/null
@@ -1,8 +0,0 @@
-#cd build
-
-#/usr/local/bin/cmake ../$1 -DUSE_LIBXSLT=ON -DXALAN_LIBRARIES= 
-
-/usr/local/bin/cmake ../HPCC-Platform -DCLIENTTOOLS_ONLY=ON -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF
-
-#make
-#make package
diff --git a/Linux-Builds/bin/build/el6/build_ee b/Linux-Builds/bin/build/el6/build_ee
deleted file mode 100755
index b5ef033..0000000
--- a/Linux-Builds/bin/build/el6/build_ee
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=0 -DUSE_LIBXSLT=ON -DXALAN_LIBRARIES= -DUSE_LIBARCHIVE=false -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF ../LN
diff --git a/Linux-Builds/bin/build/el6/build_ee_wp b/Linux-Builds/bin/build/el6/build_ee_wp
deleted file mode 100755
index 4abaa84..0000000
--- a/Linux-Builds/bin/build/el6/build_ee_wp
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-#cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=0 -DCMAKE_CXX_FLAGS="-D_DALIUSER_STACKTRACE" -DUSE_LIBXSLT=ON -DXALAN_LIBRARIES= ../LN
-
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=0  -DUSE_LIBXSLT=ON ../LN
diff --git a/Linux-Builds/bin/build/el6/build_gm b/Linux-Builds/bin/build/el6/build_gm
deleted file mode 100755
index e35de46..0000000
--- a/Linux-Builds/bin/build/el6/build_gm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DCHECK_GIT_TAG=0 ../ganglia-monitoring
diff --git a/Linux-Builds/bin/build/el6/build_ln b/Linux-Builds/bin/build/el6/build_ln
deleted file mode 100755
index 4fb3a42..0000000
--- a/Linux-Builds/bin/build/el6/build_ln
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=0  -DUSE_LIBARCHIVE=false -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF ../LN
diff --git a/Linux-Builds/bin/build/el6/build_ln_wp b/Linux-Builds/bin/build/el6/build_ln_wp
deleted file mode 100755
index b30735f..0000000
--- a/Linux-Builds/bin/build/el6/build_ln_wp
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-#cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=0 -DCMAKE_CXX_FLAGS="-D_DALIUSER_STACKTRACE" -DUSE_LIBXSLT=ON -DXALAN_LIBRARIES= ../LN
-
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=0 -DUSE_LIBXSLT=ON ../LN
diff --git a/Linux-Builds/bin/build/el6/build_nm b/Linux-Builds/bin/build/el6/build_nm
deleted file mode 100755
index 2da36d9..0000000
--- a/Linux-Builds/bin/build/el6/build_nm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DCHECK_GIT_TAG=0  -DUSE_LIBXSLT=ON  ../nagios-monitoring
diff --git a/Linux-Builds/bin/build/precise/build_dc b/Linux-Builds/bin/build/precise/build_dc
deleted file mode 100755
index ee696d4..0000000
--- a/Linux-Builds/bin/build/precise/build_dc
+++ /dev/null
@@ -1,4 +0,0 @@
-#cd build
-
-/usr/local/bin/cmake ../HPCC-Platform -DMAKE_DOCS_ONLY=ON -DUSE_NATIVE_LIBRARIES=ON
-
diff --git a/Linux-Builds/bin/build/trusty/build_gc b/Linux-Builds/bin/build/trusty/build_gc
deleted file mode 100755
index 4d4ca70..0000000
--- a/Linux-Builds/bin/build/trusty/build_gc
+++ /dev/null
@@ -1 +0,0 @@
-cmake -DCMAKE_BUILD_TYPE=Release -DWITH_SYSTEM_BOOST=1 -DFB_PROJECTS_DIR:PATH=../GraphControl -DGRAPHVIZSRC_DIR=/usr/local/src/graphviz-2.26.3 -DAGGSRC_DIR=../agg ../FireBreath
diff --git a/Linux-Builds/bin/build_hpcc.sh b/Linux-Builds/bin/build_hpcc.sh
index d4b2c05..d4740af 100755
--- a/Linux-Builds/bin/build_hpcc.sh
+++ b/Linux-Builds/bin/build_hpcc.sh
@@ -7,17 +7,17 @@ usage() {
      Options:
         -b|--branch:  HPCC component branch or tag.
         -p|--project: HPCC componet ids seperated by comma. 
-           1:  Platform community
+           1:  Platform community (rpm only)
            2:  Platform community with plugin
-           3:  Platform enterprise
+           3:  Platform enterprise (rpm only)
            4:  Platform enterprise with plugin
-           5:  Platform internal
+           5:  Platform internal (rpm only)
            6:  Platform internal with plugin
            7:  Clienttools
-           8:  Graphcontrols
+           8:  Graphcontrol (deb only)
            9:  Ganglia-monitoring
           10:  Nagios-monitoring
-          11:  Docs
+          11:  Docs (Ubuntu 12.04 precise only)
         -r|--release: HPCC release version. Example, 5.0.0-1
         -h|--help:  Help message
       
@@ -51,9 +51,9 @@ project_config_file=(
       'internal.conf' 
       'internal_with_plugins.conf' 
       'clienttools.conf' 
-      'graphcontrols.conf' 
+      'graphcontrol.conf' 
       'gangliamonitoring.conf' 
-      'bagiosmonitoring.conf' 
+      'nagiosmonitoring.conf' 
       'docs.conf' 
 )
 
@@ -85,8 +85,10 @@ done
 . ${rootDir}/bin/common
 check_distro
 echo "$DISTRO $CODENAME $PKG_TYPE $ARCH"
+export PKG_TYPE
+export CODENAME
 
-if [ ! -e  ${rootDir}/bin/config/${CODENAME}.conf  ]
+if [ ! -e  ${rootDir}/bin/config/os/${CODENAME}.conf  ]
 then
    echo ""
    echo "Build HPCC on $DISTRO $CODENAME is not supported"
@@ -96,72 +98,54 @@ fi
 
 [ ! -d $rootDir/workspace ] && mkdir $rootDir/workspace 
 cd $rootDir/workspace
-workDir=$(pwd)
+export workDir=$(pwd)
 
 [ ! -d ${workDir}/$release ] && mkdir -p  ${workDir}/$release
-releaseDir=${workDir}/$release
+export releaseDir=${workDir}/$release
 cd $releaseDir
 
-[ "$projects" == "all" ] && projects=$(grep "projects_all=" ${rootDir}/bin/config/${CODENAME}.conf | cut -d'=' -f2)
+[ ! -d output ] && mkdir output
+export outputDir=${workDir}/$release/output
+
+[ "$projects" == "all" ] && projects=$(grep "projects_all=" ${rootDir}/bin/config/os/${CODENAME}.conf | cut -d'=' -f2)
 echo $projects | tr [','] ['\n '] | while read project 
 do
   
+   . ${rootDir}/bin/config/${project_config_file[$project]}
+   
    echo 
-   echo "Build ${project_config_file[$project]} ..."
+   if [ ! -e ${rootDir}/bin/build/${CODENAME}/${build_script}_cmake_options ]
+   then
+       echo "Build ${display_name} on ${CODENAME} is not supported."
+       continue
+   fi
+   echo -ne "Build ${display_name} ... \r"
 
-   . ${rootDir}/bin/config/${project_config_file[$project]}
    [ ! -d $project_directory ] && mkdir $project_directory
    cd $project_directory
    echo "Get git repository $branch"
    ${rootDir}/bin/github/${github_script} $branch > git.log 2>&1
    if [ $? -ne 0 ]  
    then
-      "Failed to get repository $project"
+      echo "FAILED"
       continue
    fi
-   
+   echo "OK"
+  
    [ -d build ] && rm -rf build
    mkdir build
    cd build
-   echo "cmake"
-   ${rootDir}/bin/build/${CODENAME}/${build_script}  > cmake.log 2>&1
+   echo -ne "build ... \r"
+   export package_directory
+   export package_name_prefix
+   ${rootDir}/bin/build/${build_script}  > build.log 2>&1
    if [ $? -ne 0 ]  
    then
-      "Failed to run cmake $project"
+      echo "FAILED"
       continue
    fi
+   echo "OK"
 
-   if [ "$project" != "docs" ]
-   then
-      echo "make package"
-      make -j4 package > build.log 2>&1
-      if [ $? -ne 0 ]  
-      then
-         "Failed to make $project"
-         continue
-      fi
-    
-      echo "copy package"
-      [ ! -d ${releaseDir}/${package_directory} ] && mkdir -p ${releaseDir}/${package_directory}
-      cp ${package_name_prefix}*${PKG_TYPE} ${releaseDir}/${package_directory}/
-   else
-      echo "make"
-      make -j4 > build.log 2>&1
-      if [ $? -ne 0 ]  
-      then
-         "Failed to make $project"
-         continue
-      fi
-      echo "make install"
-      make install > install.log 2>&1
-      if [ $? -ne 0 ]  
-      then
-         "Failed to make install $project"
-         continue
-      fi
-      cp ${package_name_prefix}*pdf ${releaseDir}/${package_directory}/
-     
-   fi
    cd $releaseDir
 
 done
diff --git a/Linux-Builds/bin/config/clienttools.conf b/Linux-Builds/bin/config/clienttools.conf
index 13082d5..634a8b5 100644
--- a/Linux-Builds/bin/config/clienttools.conf
+++ b/Linux-Builds/bin/config/clienttools.conf
@@ -3,4 +3,4 @@ project_directory=clienttools
 github_script=github_ce
 build_script=build_ct
 package_name_prefix=hpccsystems-clienttools_community
-package_directory=bin/cienttools
+package_directory=bin/clienttools
diff --git a/Linux-Builds/bin/config/docs.conf b/Linux-Builds/bin/config/docs.conf
index e7496f5..d44eb91 100644
--- a/Linux-Builds/bin/config/docs.conf
+++ b/Linux-Builds/bin/config/docs.conf
@@ -1,6 +1,6 @@
-display_name="HPCCSystem Documentatio"
+display_name="HPCCSystem Documentation"
 project_directory=docs
 github_script=github_dc
 build_script=build_dc
-package_name_prefix=Release/docs/
+package_name_prefix=Release/docs
 package_directory=docs
diff --git a/Linux-Builds/bin/config/el6.conf b/Linux-Builds/bin/config/el6.conf
deleted file mode 100644
index 206e4e6..0000000
--- a/Linux-Builds/bin/config/el6.conf
+++ /dev/null
@@ -1 +0,0 @@
-projects_all=1,2,3,4,5,6,7,9,10
diff --git a/Linux-Builds/bin/github/github_ee b/Linux-Builds/bin/github/github_ee
index fc55a65..50eb29c 100755
--- a/Linux-Builds/bin/github/github_ee
+++ b/Linux-Builds/bin/github/github_ee
@@ -6,7 +6,8 @@ curDir=$(dirname $0)
 [ -z "$1" ] && echo "Miss tag or branch name" && exit 1
 TAG_BRANCH_NAME=enterprise_$1
 
-./build_ce $TAG_BRANCH_NAME
+${curDir}/github_ce $1
+[ $? -ne 0 ] && exit 1
 
 LN_DIR=LN
 
diff --git a/Linux-Builds/bin/github/github_ln b/Linux-Builds/bin/github/github_ln
index 341624f..7b766dd 100755
--- a/Linux-Builds/bin/github/github_ln
+++ b/Linux-Builds/bin/github/github_ln
@@ -6,7 +6,8 @@ curDir=$(dirname $0)
 [ -z "$1" ] && echo "Miss tag or branch name" && exit 1
 TAG_BRANCH_NAME=internal_$1
 
-./build_ce $TAG_BRANCH_NAME
+${curDir}/github_ce $1
+[ $? -ne 0 ] && exit 1
 
 LN_DIR=LN
 
diff --git a/Linux-Builds/bin/github/github_nm b/Linux-Builds/bin/github/github_nm
index 2a77ef8..ecf3632 100755
--- a/Linux-Builds/bin/github/github_nm
+++ b/Linux-Builds/bin/github/github_nm
@@ -4,16 +4,16 @@ curDir=$(dirname $0)
 . ${curDir}/github_common
 
 [ -z "$1" ] && echo "Miss tag or branch name" && exit 1
-TAG_BRANCH_NAME=enterprise_$1
+TAG_BRANCH_NAME=nagios-monitoring_$1
 
-./build_ce $TAG_BRANCH_NAME  OFF
+${curDir}/github_ce $TAG_BRANCH_NAME  OFF
 
 NM_DIR=nagios-monitoring
 
 echo ""
 echo "get HPCC Nagios Monitoring repo"
 [ -d $NM_DIR ] && rm -rf $NM_DIR
-NM_REPO=https://github.com/hpcc-systems/NM.git
+NM_REPO=https://github.com/hpcc-systems/nagios-monitoring.git
 
 git clone $NM_REPO