From ffc62a74903602a2c88ec60c593c27c46ba94fe5 Mon Sep 17 00:00:00 2001
From: Brad Barber <bradb@shore.net>
Date: Sun, 6 Mar 2011 23:43:23 -0500
Subject: [PATCH] Major reorg for shadow builds.  Just moving files. Need to
 update .pro and build files.

---
 .gitignore                                    | 18 +++--
 CMakeLists.txt                                |  9 ---
 .../qhull-2003.1/poly.c-qh_gethash.patch      |  0
 html/qhull-cpp.xml                            |  4 +-
 src/CMakeLists.txt                            | 78 ++-----------------
 src/Changes.txt                               |  1 +
 src/libqhull/CMakeLists.txt                   | 73 +++++++++++++++++
 src/{ => libqhull}/Makefile.txt               |  0
 src/{ => libqhull}/Mborland                   |  0
 src/{ => libqhull}/geom.c                     |  4 +-
 src/{ => libqhull}/geom.h                     |  4 +-
 src/{ => libqhull}/geom2.c                    |  4 +-
 src/{ => libqhull}/global.c                   |  4 +-
 src/{ => libqhull}/index.htm                  |  0
 src/{ => libqhull}/io.c                       |  4 +-
 src/{ => libqhull}/io.h                       |  4 +-
 src/{ => libqhull}/libqhull.c                 |  4 +-
 src/{ => libqhull}/libqhull.h                 |  4 +-
 {project => src}/libqhull/libqhull.pro        |  0
 src/{ => libqhull}/mem.c                      |  4 +-
 src/{ => libqhull}/mem.h                      |  4 +-
 src/{ => libqhull}/merge.c                    |  4 +-
 src/{ => libqhull}/merge.h                    |  4 +-
 src/{ => libqhull}/poly.c                     |  4 +-
 src/{ => libqhull}/poly.h                     |  4 +-
 src/{ => libqhull}/poly2.c                    |  4 +-
 src/{ => libqhull}/qh-geom.htm                |  0
 src/{ => libqhull}/qh-globa.htm               |  0
 src/{ => libqhull}/qh-io.htm                  |  0
 src/{ => libqhull}/qh-mem.htm                 |  0
 src/{ => libqhull}/qh-merge.htm               |  0
 src/{ => libqhull}/qh-poly.htm                |  0
 src/{ => libqhull}/qh-qhull.htm               |  0
 src/{ => libqhull}/qh-set.htm                 |  0
 src/{ => libqhull}/qh-stat.htm                |  0
 src/{ => libqhull}/qh-user.htm                |  0
 src/{ => libqhull}/qhull.h                    |  4 +-
 src/{ => libqhull}/qhull_a.h                  |  4 +-
 src/{ => libqhull}/qset.c                     |  4 +-
 src/{ => libqhull}/qset.h                     |  4 +-
 src/{ => libqhull}/random.c                   |  0
 src/{ => libqhull}/random.h                   |  4 +-
 src/{ => libqhull}/rboxlib.c                  |  0
 src/{ => libqhull}/stat.c                     |  4 +-
 src/{ => libqhull}/stat.h                     |  4 +-
 src/{ => libqhull}/user.c                     |  0
 src/{ => libqhull}/user.h                     |  0
 src/{ => libqhull}/usermem.c                  |  0
 src/{ => libqhull}/userprintf.c               |  0
 {cpp => src/libqhullcpp}/Coordinates.cpp      |  4 +-
 {cpp => src/libqhullcpp}/Coordinates.h        |  4 +-
 {cpp => src/libqhullcpp}/PointCoordinates.cpp |  4 +-
 {cpp => src/libqhullcpp}/PointCoordinates.h   |  4 +-
 {cpp => src/libqhullcpp}/Qhull.cpp            |  4 +-
 {cpp => src/libqhullcpp}/Qhull.h              |  4 +-
 {cpp => src/libqhullcpp}/QhullError.cpp       |  0
 {cpp => src/libqhullcpp}/QhullError.h         |  4 +-
 {cpp => src/libqhullcpp}/QhullEvent.cpp       |  0
 {cpp => src/libqhullcpp}/QhullEvent.h         |  4 +-
 {cpp => src/libqhullcpp}/QhullFacet.cpp       |  4 +-
 {cpp => src/libqhullcpp}/QhullFacet.h         |  4 +-
 {cpp => src/libqhullcpp}/QhullFacetList.cpp   |  4 +-
 {cpp => src/libqhullcpp}/QhullFacetList.h     |  4 +-
 {cpp => src/libqhullcpp}/QhullFacetSet.cpp    |  4 +-
 {cpp => src/libqhullcpp}/QhullFacetSet.h      |  4 +-
 {cpp => src/libqhullcpp}/QhullHyperplane.cpp  |  4 +-
 {cpp => src/libqhullcpp}/QhullHyperplane.h    |  4 +-
 {cpp => src/libqhullcpp}/QhullIterator.h      |  4 +-
 {cpp => src/libqhullcpp}/QhullLinkedList.h    |  4 +-
 {cpp => src/libqhullcpp}/QhullLog.cpp         |  4 +-
 {cpp => src/libqhullcpp}/QhullLog.h           |  4 +-
 {cpp => src/libqhullcpp}/QhullPoint.cpp       |  4 +-
 {cpp => src/libqhullcpp}/QhullPoint.h         |  4 +-
 {cpp => src/libqhullcpp}/QhullPointSet.cpp    |  4 +-
 {cpp => src/libqhullcpp}/QhullPointSet.h      |  4 +-
 {cpp => src/libqhullcpp}/QhullPoints.cpp      |  4 +-
 {cpp => src/libqhullcpp}/QhullPoints.h        |  4 +-
 {cpp => src/libqhullcpp}/QhullQh.cpp          |  4 +-
 {cpp => src/libqhullcpp}/QhullQh.h            |  4 +-
 {cpp => src/libqhullcpp}/QhullRidge.cpp       |  4 +-
 {cpp => src/libqhullcpp}/QhullRidge.h         |  4 +-
 {cpp => src/libqhullcpp}/QhullSet.cpp         |  4 +-
 {cpp => src/libqhullcpp}/QhullSet.h           |  4 +-
 {cpp => src/libqhullcpp}/QhullSets.h          |  4 +-
 {cpp => src/libqhullcpp}/QhullStat.cpp        |  4 +-
 {cpp => src/libqhullcpp}/QhullStat.h          |  4 +-
 {cpp => src/libqhullcpp}/QhullVertex.cpp      |  4 +-
 {cpp => src/libqhullcpp}/QhullVertex.h        |  4 +-
 {cpp => src/libqhullcpp}/QhullVertexSet.cpp   |  4 +-
 {cpp => src/libqhullcpp}/QhullVertexSet.h     |  4 +-
 {cpp => src/libqhullcpp}/RboxPoints.cpp       |  4 +-
 {cpp => src/libqhullcpp}/RboxPoints.h         |  4 +-
 {cpp => src/libqhullcpp}/UsingLibQhull.cpp    |  4 +-
 {cpp => src/libqhullcpp}/UsingLibQhull.h      |  4 +-
 {cpp => src/libqhullcpp}/functionObjects.h    |  4 +-
 {project => src}/libqhullcpp/libqhullcpp.pro  |  0
 {cpp => src/libqhullcpp}/qhull_interface.cpp  |  0
 {cpp => src/libqhullcpp}/qt-qhull.cpp         |  4 +-
 {project => src}/libqhullp/libqhullp.pro      |  0
 src/{ => qconvex}/qconvex.c                   |  0
 {project => src}/qconvex/qconvex.pro          |  0
 src/{ => qdelaunay}/qdelaun.c                 |  0
 {project => src}/qdelaunay/qdelaunay.pro      |  0
 src/{ => qhalf}/qhalf.c                       |  0
 {project => src}/qhalf/qhalf.pro              |  0
 {project => src}/qhull-all.pro                |  0
 {project => src}/qhull/qhull.pro              |  0
 src/{ => qhull}/unix.c                        |  4 +-
 {cpp => src}/qhulltest/Coordinates_test.cpp   |  4 +-
 .../qhulltest/PointCoordinates_test.cpp       |  4 +-
 {cpp => src}/qhulltest/Point_test.cpp         |  4 +-
 .../qhulltest/QhullFacetList_test.cpp         |  4 +-
 {cpp => src}/qhulltest/QhullFacetSet_test.cpp |  4 +-
 {cpp => src}/qhulltest/QhullFacet_test.cpp    |  4 +-
 .../qhulltest/QhullHyperplane_test.cpp        |  4 +-
 .../qhulltest/QhullLinkedList_test.cpp        |  4 +-
 {cpp => src}/qhulltest/QhullPointSet_test.cpp |  4 +-
 {cpp => src}/qhulltest/QhullPoint_test.cpp    |  4 +-
 {cpp => src}/qhulltest/QhullPoints_test.cpp   |  4 +-
 {cpp => src}/qhulltest/QhullRidge_test.cpp    |  4 +-
 {cpp => src}/qhulltest/QhullSet_test.cpp      |  4 +-
 .../qhulltest/QhullVertexSet_test.cpp         |  4 +-
 {cpp => src}/qhulltest/QhullVertex_test.cpp   |  4 +-
 {cpp => src}/qhulltest/Qhull_test.cpp         |  4 +-
 {cpp => src}/qhulltest/RboxPoints_test.cpp    |  4 +-
 {cpp => src}/qhulltest/UsingLibQhull_test.cpp |  4 +-
 {cpp => src}/qhulltest/qhulltest.cpp          |  4 +-
 {project => src}/qhulltest/qhulltest.pro      |  0
 src/{ => qvoronoi}/qvoronoi.c                 |  0
 {project => src}/qvoronoi/qvoronoi.pro        |  0
 src/{ => rbox}/rbox.c                         |  0
 {project => src}/rbox/rbox.pro                |  0
 {cpp => src}/road/RoadError.cpp               | 20 ++---
 {cpp => src}/road/RoadError.h                 |  8 +-
 {cpp => src}/road/RoadLogEvent.cpp            | 13 +++-
 {cpp => src}/road/RoadLogEvent.h              |  6 +-
 {cpp => src}/road/RoadTest.cpp                |  8 +-
 {cpp => src}/road/RoadTest.h                  | 27 ++++---
 src/{ => user_eg}/user_eg.c                   |  0
 {project => src}/user_eg/user_eg.pro          |  0
 src/{ => user_eg2}/user_eg2.c                 |  0
 {project => src}/user_eg2/user_eg2.pro        |  0
 {cpp => src/user_eg3}/user_eg3.cpp            |  0
 {project => src}/user_eg3/user_eg3.pro        |  0
 144 files changed, 311 insertions(+), 302 deletions(-)
 delete mode 100644 CMakeLists.txt
 rename {project => eg}/patch/qhull-2003.1/poly.c-qh_gethash.patch (100%)
 create mode 100644 src/libqhull/CMakeLists.txt
 rename src/{ => libqhull}/Makefile.txt (100%)
 rename src/{ => libqhull}/Mborland (100%)
 rename src/{ => libqhull}/geom.c (99%)
 rename src/{ => libqhull}/geom.h (98%)
 rename src/{ => libqhull}/geom2.c (99%)
 rename src/{ => libqhull}/global.c (99%)
 rename src/{ => libqhull}/index.htm (100%)
 rename src/{ => libqhull}/io.c (99%)
 rename src/{ => libqhull}/io.h (98%)
 rename src/{ => libqhull}/libqhull.c (99%)
 rename src/{ => libqhull}/libqhull.h (99%)
 rename {project => src}/libqhull/libqhull.pro (100%)
 rename src/{ => libqhull}/mem.c (99%)
 rename src/{ => libqhull}/mem.h (98%)
 rename src/{ => libqhull}/merge.c (99%)
 rename src/{ => libqhull}/merge.h (98%)
 rename src/{ => libqhull}/poly.c (99%)
 rename src/{ => libqhull}/poly.h (98%)
 rename src/{ => libqhull}/poly2.c (99%)
 rename src/{ => libqhull}/qh-geom.htm (100%)
 rename src/{ => libqhull}/qh-globa.htm (100%)
 rename src/{ => libqhull}/qh-io.htm (100%)
 rename src/{ => libqhull}/qh-mem.htm (100%)
 rename src/{ => libqhull}/qh-merge.htm (100%)
 rename src/{ => libqhull}/qh-poly.htm (100%)
 rename src/{ => libqhull}/qh-qhull.htm (100%)
 rename src/{ => libqhull}/qh-set.htm (100%)
 rename src/{ => libqhull}/qh-stat.htm (100%)
 rename src/{ => libqhull}/qh-user.htm (100%)
 rename src/{ => libqhull}/qhull.h (73%)
 rename src/{ => libqhull}/qhull_a.h (97%)
 rename src/{ => libqhull}/qset.c (99%)
 rename src/{ => libqhull}/qset.h (99%)
 rename src/{ => libqhull}/random.c (100%)
 rename src/{ => libqhull}/random.h (87%)
 rename src/{ => libqhull}/rboxlib.c (100%)
 rename src/{ => libqhull}/stat.c (99%)
 rename src/{ => libqhull}/stat.h (99%)
 rename src/{ => libqhull}/user.c (100%)
 rename src/{ => libqhull}/user.h (100%)
 rename src/{ => libqhull}/usermem.c (100%)
 rename src/{ => libqhull}/userprintf.c (100%)
 rename {cpp => src/libqhullcpp}/Coordinates.cpp (96%)
 rename {cpp => src/libqhullcpp}/Coordinates.h (99%)
 rename {cpp => src/libqhullcpp}/PointCoordinates.cpp (98%)
 rename {cpp => src/libqhullcpp}/PointCoordinates.h (98%)
 rename {cpp => src/libqhullcpp}/Qhull.cpp (99%)
 rename {cpp => src/libqhullcpp}/Qhull.h (98%)
 rename {cpp => src/libqhullcpp}/QhullError.cpp (100%)
 rename {cpp => src/libqhullcpp}/QhullError.h (94%)
 rename {cpp => src/libqhullcpp}/QhullEvent.cpp (100%)
 rename {cpp => src/libqhullcpp}/QhullEvent.h (93%)
 rename {cpp => src/libqhullcpp}/QhullFacet.cpp (99%)
 rename {cpp => src/libqhullcpp}/QhullFacet.h (98%)
 rename {cpp => src/libqhullcpp}/QhullFacetList.cpp (96%)
 rename {cpp => src/libqhullcpp}/QhullFacetList.h (96%)
 rename {cpp => src/libqhullcpp}/QhullFacetSet.cpp (96%)
 rename {cpp => src/libqhullcpp}/QhullFacetSet.h (96%)
 rename {cpp => src/libqhullcpp}/QhullHyperplane.cpp (96%)
 rename {cpp => src/libqhullcpp}/QhullHyperplane.h (97%)
 rename {cpp => src/libqhullcpp}/QhullIterator.h (98%)
 rename {cpp => src/libqhullcpp}/QhullLinkedList.h (98%)
 rename {cpp => src/libqhullcpp}/QhullLog.cpp (96%)
 rename {cpp => src/libqhullcpp}/QhullLog.h (95%)
 rename {cpp => src/libqhullcpp}/QhullPoint.cpp (97%)
 rename {cpp => src/libqhullcpp}/QhullPoint.h (97%)
 rename {cpp => src/libqhullcpp}/QhullPointSet.cpp (97%)
 rename {cpp => src/libqhullcpp}/QhullPointSet.h (98%)
 rename {cpp => src/libqhullcpp}/QhullPoints.cpp (97%)
 rename {cpp => src/libqhullcpp}/QhullPoints.h (99%)
 rename {cpp => src/libqhullcpp}/QhullQh.cpp (96%)
 rename {cpp => src/libqhullcpp}/QhullQh.h (90%)
 rename {cpp => src/libqhullcpp}/QhullRidge.cpp (95%)
 rename {cpp => src/libqhullcpp}/QhullRidge.h (96%)
 rename {cpp => src/libqhullcpp}/QhullSet.cpp (89%)
 rename {cpp => src/libqhullcpp}/QhullSet.h (98%)
 rename {cpp => src/libqhullcpp}/QhullSets.h (83%)
 rename {cpp => src/libqhullcpp}/QhullStat.cpp (85%)
 rename {cpp => src/libqhullcpp}/QhullStat.h (90%)
 rename {cpp => src/libqhullcpp}/QhullVertex.cpp (95%)
 rename {cpp => src/libqhullcpp}/QhullVertex.h (96%)
 rename {cpp => src/libqhullcpp}/QhullVertexSet.cpp (95%)
 rename {cpp => src/libqhullcpp}/QhullVertexSet.h (95%)
 rename {cpp => src/libqhullcpp}/RboxPoints.cpp (97%)
 rename {cpp => src/libqhullcpp}/RboxPoints.h (93%)
 rename {cpp => src/libqhullcpp}/UsingLibQhull.cpp (98%)
 rename {cpp => src/libqhullcpp}/UsingLibQhull.h (97%)
 rename {cpp => src/libqhullcpp}/functionObjects.h (91%)
 rename {project => src}/libqhullcpp/libqhullcpp.pro (100%)
 rename {cpp => src/libqhullcpp}/qhull_interface.cpp (100%)
 rename {cpp => src/libqhullcpp}/qt-qhull.cpp (95%)
 rename {project => src}/libqhullp/libqhullp.pro (100%)
 rename src/{ => qconvex}/qconvex.c (100%)
 rename {project => src}/qconvex/qconvex.pro (100%)
 rename src/{ => qdelaunay}/qdelaun.c (100%)
 rename {project => src}/qdelaunay/qdelaunay.pro (100%)
 rename src/{ => qhalf}/qhalf.c (100%)
 rename {project => src}/qhalf/qhalf.pro (100%)
 rename {project => src}/qhull-all.pro (100%)
 rename {project => src}/qhull/qhull.pro (100%)
 rename src/{ => qhull}/unix.c (99%)
 rename {cpp => src}/qhulltest/Coordinates_test.cpp (98%)
 rename {cpp => src}/qhulltest/PointCoordinates_test.cpp (98%)
 rename {cpp => src}/qhulltest/Point_test.cpp (97%)
 rename {cpp => src}/qhulltest/QhullFacetList_test.cpp (97%)
 rename {cpp => src}/qhulltest/QhullFacetSet_test.cpp (96%)
 rename {cpp => src}/qhulltest/QhullFacet_test.cpp (98%)
 rename {cpp => src}/qhulltest/QhullHyperplane_test.cpp (98%)
 rename {cpp => src}/qhulltest/QhullLinkedList_test.cpp (98%)
 rename {cpp => src}/qhulltest/QhullPointSet_test.cpp (98%)
 rename {cpp => src}/qhulltest/QhullPoint_test.cpp (98%)
 rename {cpp => src}/qhulltest/QhullPoints_test.cpp (98%)
 rename {cpp => src}/qhulltest/QhullRidge_test.cpp (96%)
 rename {cpp => src}/qhulltest/QhullSet_test.cpp (98%)
 rename {cpp => src}/qhulltest/QhullVertexSet_test.cpp (96%)
 rename {cpp => src}/qhulltest/QhullVertex_test.cpp (97%)
 rename {cpp => src}/qhulltest/Qhull_test.cpp (98%)
 rename {cpp => src}/qhulltest/RboxPoints_test.cpp (97%)
 rename {cpp => src}/qhulltest/UsingLibQhull_test.cpp (98%)
 rename {cpp => src}/qhulltest/qhulltest.cpp (94%)
 rename {project => src}/qhulltest/qhulltest.pro (100%)
 rename src/{ => qvoronoi}/qvoronoi.c (100%)
 rename {project => src}/qvoronoi/qvoronoi.pro (100%)
 rename src/{ => rbox}/rbox.c (100%)
 rename {project => src}/rbox/rbox.pro (100%)
 rename {cpp => src}/road/RoadError.cpp (88%)
 rename {cpp => src}/road/RoadError.h (91%)
 rename {cpp => src}/road/RoadLogEvent.cpp (87%)
 rename {cpp => src}/road/RoadLogEvent.h (94%)
 rename {cpp => src}/road/RoadTest.cpp (87%)
 rename {cpp => src}/road/RoadTest.h (78%)
 rename src/{ => user_eg}/user_eg.c (100%)
 rename {project => src}/user_eg/user_eg.pro (100%)
 rename src/{ => user_eg2}/user_eg2.c (100%)
 rename {project => src}/user_eg2/user_eg2.pro (100%)
 rename {cpp => src/user_eg3}/user_eg3.cpp (100%)
 rename {project => src}/user_eg3/user_eg3.pro (100%)

diff --git a/.gitignore b/.gitignore
index bd7f446..ecd27fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,20 +17,24 @@ r?
 *.rej
 
 # Build products
+bin/*
+lib/*
+build/*
 tmp/*
-project/Makefile*
-project/*/Makefile*
-project/*/object_script*
-project/*/Release/*
-project/*/Debug/*
-project/*/release/*
-project/*/debug/*
 *.a
 *.dll
 *.lib
 *.exe
 *.o
 *.md5sum
+*.vcproj
+
+# Out-of-date directories
+config/*
+project/*
+working/*
+working/*/*
+
 
 # Qt files
 *.pro.user
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index 61c978e..0000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-project(qhull)
-cmake_minimum_required(VERSION 2.4)
-if(COMMAND cmake_policy)
-  cmake_policy(SET CMP0003 NEW)
-endif(COMMAND cmake_policy)
-
-add_subdirectory(src)
-
-install(DIRECTORY html DESTINATION share/doc/qhull)
diff --git a/project/patch/qhull-2003.1/poly.c-qh_gethash.patch b/eg/patch/qhull-2003.1/poly.c-qh_gethash.patch
similarity index 100%
rename from project/patch/qhull-2003.1/poly.c-qh_gethash.patch
rename to eg/patch/qhull-2003.1/poly.c-qh_gethash.patch
diff --git a/html/qhull-cpp.xml b/html/qhull-cpp.xml
index 9bfb955..b5ad052 100644
--- a/html/qhull-cpp.xml
+++ b/html/qhull-cpp.xml
@@ -6,8 +6,8 @@
    xmlns:rf="http://schemas.roadintranet.org/road-faq-1"
  title=" C++ interface to Qhull"
  file="qhull-cpp.xml"
- fileid="$Id: //product/qhull/main/rel/html/qhull-cpp.xml#25 $$Change: 1327 $"
- fileChange="$DateTime: 2011/03/06 18:21:13 $$Author: bbarber $">
+ fileid="$Id: //main/2011/qhull/html/qhull-cpp.xml#1 $$Change: 1330 $"
+ fileChange="$DateTime: 2011/03/06 21:30:00 $$Author: bbarber $">
     <div><h4>Qhull C++  -- C++ interface to Qhull</h4></div>
     <rf:copyright>
         <a href="../cpp/COPYING.txt">Copyright</a> (c) 2009-2010, C.B. Barber
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 45e246e..61c978e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,73 +1,9 @@
-project(qhull_lib)
+project(qhull)
+cmake_minimum_required(VERSION 2.4)
+if(COMMAND cmake_policy)
+  cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
 
-# Order object files by frequency of execution.  Small files at end.
-set(
-    qhull_src
-        rboxlib.c
-        user.c
-        global.c
-        stat.c
-        io.c
-        geom2.c
-        poly2.c
-        merge.c
-        libqhull.c
-        geom.c
-        poly.c
-        qset.c
-        mem.c
-        usermem.c
-        userprintf.c
-        random.c
-)
+add_subdirectory(src)
 
-file(GLOB qhull_hdr *.h)
-
-add_library(qhull SHARED ${qhull_src})
-target_link_libraries(qhull m)
-if(UNIX)
-	if(APPLE)
-		set_target_properties(qhull PROPERTIES 
-			INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-	else(APPLE)
-		set_target_properties(qhull PROPERTIES 
-			INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
-			INSTALL_RPATH_USE_LINK_PATH TRUE
-			BUILD_WITH_INSTALL_RPATH FALSE)
-	endif(APPLE)
-endif(UNIX)
-add_library(qhullstatic STATIC ${qhull_src})
-set_property(TARGET qhullstatic PROPERTY OUTPUT_NAME "qhull")
-
-set(qhullcmd_SOURCES  unix.c)
-set(rbox_SOURCES  rbox.c)
-set(qconvex_SOURCES  qconvex.c)
-set(qdelaunay_SOURCES  qdelaun.c)
-set(qvoronoi_SOURCES  qvoronoi.c)
-set(qhalf_SOURCES  qhalf.c)
-
-
-add_executable(qhullcmd ${qhullcmd_SOURCES})
-target_link_libraries(qhullcmd qhull)
-set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull")
-
-add_executable(rbox ${rbox_SOURCES})
-target_link_libraries(rbox qhull)
-
-add_executable(qconvex ${qconvex_SOURCES})
-target_link_libraries(qconvex qhull)
-
-add_executable(qdelaunay ${qdelaunay_SOURCES})
-target_link_libraries(qdelaunay qhull)
-
-add_executable(qvoronoi ${qvoronoi_SOURCES})
-target_link_libraries(qvoronoi qhull)
-
-add_executable(qhalf ${qhalf_SOURCES})
-target_link_libraries(qhalf qhull)
-
-install(TARGETS qhull qhullstatic qhullcmd rbox qconvex qdelaunay qvoronoi qhalf
-	RUNTIME DESTINATION bin
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib)
-install(FILES libqhull.h DESTINATION include)
+install(DIRECTORY html DESTINATION share/doc/qhull)
diff --git a/src/Changes.txt b/src/Changes.txt
index 4cbefe2..77ef9ad 100644
--- a/src/Changes.txt
+++ b/src/Changes.txt
@@ -61,6 +61,7 @@ gitorious.org/qhull 2011/03/06
  - qhull-cpp.xml: Add naming conventions, try, Temporarily, p, end, private, error
  - Changes.txt: More to do.  Links to build systems
  - Delete src/MBorland
+ - Renamed RoadError::defined() to RoadError::isDefined()
 
 ------------
 gitorious.org/qhull 2010/03/17
diff --git a/src/libqhull/CMakeLists.txt b/src/libqhull/CMakeLists.txt
new file mode 100644
index 0000000..45e246e
--- /dev/null
+++ b/src/libqhull/CMakeLists.txt
@@ -0,0 +1,73 @@
+project(qhull_lib)
+
+# Order object files by frequency of execution.  Small files at end.
+set(
+    qhull_src
+        rboxlib.c
+        user.c
+        global.c
+        stat.c
+        io.c
+        geom2.c
+        poly2.c
+        merge.c
+        libqhull.c
+        geom.c
+        poly.c
+        qset.c
+        mem.c
+        usermem.c
+        userprintf.c
+        random.c
+)
+
+file(GLOB qhull_hdr *.h)
+
+add_library(qhull SHARED ${qhull_src})
+target_link_libraries(qhull m)
+if(UNIX)
+	if(APPLE)
+		set_target_properties(qhull PROPERTIES 
+			INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+	else(APPLE)
+		set_target_properties(qhull PROPERTIES 
+			INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
+			INSTALL_RPATH_USE_LINK_PATH TRUE
+			BUILD_WITH_INSTALL_RPATH FALSE)
+	endif(APPLE)
+endif(UNIX)
+add_library(qhullstatic STATIC ${qhull_src})
+set_property(TARGET qhullstatic PROPERTY OUTPUT_NAME "qhull")
+
+set(qhullcmd_SOURCES  unix.c)
+set(rbox_SOURCES  rbox.c)
+set(qconvex_SOURCES  qconvex.c)
+set(qdelaunay_SOURCES  qdelaun.c)
+set(qvoronoi_SOURCES  qvoronoi.c)
+set(qhalf_SOURCES  qhalf.c)
+
+
+add_executable(qhullcmd ${qhullcmd_SOURCES})
+target_link_libraries(qhullcmd qhull)
+set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull")
+
+add_executable(rbox ${rbox_SOURCES})
+target_link_libraries(rbox qhull)
+
+add_executable(qconvex ${qconvex_SOURCES})
+target_link_libraries(qconvex qhull)
+
+add_executable(qdelaunay ${qdelaunay_SOURCES})
+target_link_libraries(qdelaunay qhull)
+
+add_executable(qvoronoi ${qvoronoi_SOURCES})
+target_link_libraries(qvoronoi qhull)
+
+add_executable(qhalf ${qhalf_SOURCES})
+target_link_libraries(qhalf qhull)
+
+install(TARGETS qhull qhullstatic qhullcmd rbox qconvex qdelaunay qvoronoi qhalf
+	RUNTIME DESTINATION bin
+	LIBRARY DESTINATION lib
+	ARCHIVE DESTINATION lib)
+install(FILES libqhull.h DESTINATION include)
diff --git a/src/Makefile.txt b/src/libqhull/Makefile.txt
similarity index 100%
rename from src/Makefile.txt
rename to src/libqhull/Makefile.txt
diff --git a/src/Mborland b/src/libqhull/Mborland
similarity index 100%
rename from src/Mborland
rename to src/libqhull/Mborland
diff --git a/src/geom.c b/src/libqhull/geom.c
similarity index 99%
rename from src/geom.c
rename to src/libqhull/geom.c
index 9b68375..60ad336 100644
--- a/src/geom.c
+++ b/src/libqhull/geom.c
@@ -7,8 +7,8 @@
    see qh-geom.htm and geom.h
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/geom.c#29 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/geom.c#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 
    infrequent code goes into geom2.c
 */
diff --git a/src/geom.h b/src/libqhull/geom.h
similarity index 98%
rename from src/geom.h
rename to src/libqhull/geom.h
index b9d7627..7d56bb2 100644
--- a/src/geom.h
+++ b/src/libqhull/geom.h
@@ -7,8 +7,8 @@
    see qh-geom.htm and geom.c
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/geom.h#18 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/geom.h#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #ifndef qhDEFgeom
diff --git a/src/geom2.c b/src/libqhull/geom2.c
similarity index 99%
rename from src/geom2.c
rename to src/libqhull/geom2.c
index 33e2e4d..cb1f8e5 100644
--- a/src/geom2.c
+++ b/src/libqhull/geom2.c
@@ -8,8 +8,8 @@
    see qh-geom.htm and geom.h
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/geom2.c#29 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/geom2.c#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 
    frequently used code goes into geom.c
 */
diff --git a/src/global.c b/src/libqhull/global.c
similarity index 99%
rename from src/global.c
rename to src/libqhull/global.c
index 3c6141a..d4fefc4 100644
--- a/src/global.c
+++ b/src/libqhull/global.c
@@ -12,8 +12,8 @@
    see qhull_a.h for internal functions
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/global.c#60 $$Change: 1183 $
-   $DateTime: 2010/01/13 20:59:32 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/global.c#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
  */
 
 #include "qhull_a.h"
diff --git a/src/index.htm b/src/libqhull/index.htm
similarity index 100%
rename from src/index.htm
rename to src/libqhull/index.htm
diff --git a/src/io.c b/src/libqhull/io.c
similarity index 99%
rename from src/io.c
rename to src/libqhull/io.c
index 0ca93ae..acedc86 100644
--- a/src/io.c
+++ b/src/libqhull/io.c
@@ -14,8 +14,8 @@
    This allows the user to avoid loading io.o from qhull.a
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/io.c#40 $$Change: 1213 $
-   $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/io.c#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #include "qhull_a.h"
diff --git a/src/io.h b/src/libqhull/io.h
similarity index 98%
rename from src/io.h
rename to src/libqhull/io.h
index eb78b75..aa2d26a 100644
--- a/src/io.h
+++ b/src/libqhull/io.h
@@ -7,8 +7,8 @@
    see README, libqhull.h and io.c
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/io.h#25 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/io.h#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #ifndef qhDEFio
diff --git a/src/libqhull.c b/src/libqhull/libqhull.c
similarity index 99%
rename from src/libqhull.c
rename to src/libqhull/libqhull.c
index 0854b0a..1f1ffb6 100644
--- a/src/libqhull.c
+++ b/src/libqhull/libqhull.c
@@ -11,8 +11,8 @@
    see qhull_a.h for internal functions
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/libqhull.c#7 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/libqhull.c#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #include "qhull_a.h"
diff --git a/src/libqhull.h b/src/libqhull/libqhull.h
similarity index 99%
rename from src/libqhull.h
rename to src/libqhull/libqhull.h
index 2bf4435..35355b2 100644
--- a/src/libqhull.h
+++ b/src/libqhull/libqhull.h
@@ -7,8 +7,8 @@
    see qh-qhull.htm, qhull_a.h
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/libqhull.h#9 $$Change: 1172 $
-   $DateTime: 2010/01/09 21:42:16 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/libqhull.h#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 
    NOTE: access to qh_qh is via the 'qh' macro.  This allows
    qh_qh to be either a pointer or a structure.  An example
diff --git a/project/libqhull/libqhull.pro b/src/libqhull/libqhull.pro
similarity index 100%
rename from project/libqhull/libqhull.pro
rename to src/libqhull/libqhull.pro
diff --git a/src/mem.c b/src/libqhull/mem.c
similarity index 99%
rename from src/mem.c
rename to src/libqhull/mem.c
index c1a533b..86d7311 100644
--- a/src/mem.c
+++ b/src/libqhull/mem.c
@@ -30,8 +30,8 @@
     global.c (qh_initbuffers) for an example of using mem.c
 
   copyright (c) 1993-2010 The Geometry Center.
-  $Id: //product/qhull/main/rel/src/mem.c#32 $$Change: 1164 $
-  $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+  $Id: //main/2011/qhull/src/libqhull/mem.c#1 $$Change: 1330 $
+  $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #include "mem.h"
diff --git a/src/mem.h b/src/libqhull/mem.h
similarity index 98%
rename from src/mem.h
rename to src/libqhull/mem.h
index 90ca632..eb5c13b 100644
--- a/src/mem.h
+++ b/src/libqhull/mem.h
@@ -12,8 +12,8 @@
      qh_errexit(qhmem_ERRqhull, NULL, NULL) otherwise
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/mem.h#28 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/mem.h#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #ifndef qhDEFmem
diff --git a/src/merge.c b/src/libqhull/merge.c
similarity index 99%
rename from src/merge.c
rename to src/libqhull/merge.c
index 8fcc1bb..12ca3e9 100644
--- a/src/merge.c
+++ b/src/libqhull/merge.c
@@ -21,8 +21,8 @@
    vertex->neighbors not set until the first merge occurs
 
    copyright (c) 1993-2010 C.B. Barber.
-   $Id: //product/qhull/main/rel/src/merge.c#27 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/merge.c#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #include "qhull_a.h"
diff --git a/src/merge.h b/src/libqhull/merge.h
similarity index 98%
rename from src/merge.h
rename to src/libqhull/merge.h
index 7ca9a4f..a1073c2 100644
--- a/src/merge.h
+++ b/src/libqhull/merge.h
@@ -7,8 +7,8 @@
    see qh-merge.htm and merge.c
 
    copyright (c) 1993-2010 C.B. Barber.
-   $Id: //product/qhull/main/rel/src/merge.h#21 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/merge.h#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #ifndef qhDEFmerge
diff --git a/src/poly.c b/src/libqhull/poly.c
similarity index 99%
rename from src/poly.c
rename to src/libqhull/poly.c
index bc87bc6..5650d03 100644
--- a/src/poly.c
+++ b/src/libqhull/poly.c
@@ -10,8 +10,8 @@
    (all but top 50 and their callers 12/3/95)
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/poly.c#26 $$Change: 1171 $
-   $DateTime: 2010/01/09 10:11:25 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/poly.c#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #include "qhull_a.h"
diff --git a/src/poly.h b/src/libqhull/poly.h
similarity index 98%
rename from src/poly.h
rename to src/libqhull/poly.h
index 929de2c..17d0495 100644
--- a/src/poly.h
+++ b/src/libqhull/poly.h
@@ -7,8 +7,8 @@
    see qh-poly.htm, libqhull.h and poly.c
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/poly.h#22 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/poly.h#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #ifndef qhDEFpoly
diff --git a/src/poly2.c b/src/libqhull/poly2.c
similarity index 99%
rename from src/poly2.c
rename to src/libqhull/poly2.c
index 451d66f..8b21028 100644
--- a/src/poly2.c
+++ b/src/libqhull/poly2.c
@@ -9,8 +9,8 @@
    frequently used code is in poly.c
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/poly2.c#40 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/poly2.c#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #include "qhull_a.h"
diff --git a/src/qh-geom.htm b/src/libqhull/qh-geom.htm
similarity index 100%
rename from src/qh-geom.htm
rename to src/libqhull/qh-geom.htm
diff --git a/src/qh-globa.htm b/src/libqhull/qh-globa.htm
similarity index 100%
rename from src/qh-globa.htm
rename to src/libqhull/qh-globa.htm
diff --git a/src/qh-io.htm b/src/libqhull/qh-io.htm
similarity index 100%
rename from src/qh-io.htm
rename to src/libqhull/qh-io.htm
diff --git a/src/qh-mem.htm b/src/libqhull/qh-mem.htm
similarity index 100%
rename from src/qh-mem.htm
rename to src/libqhull/qh-mem.htm
diff --git a/src/qh-merge.htm b/src/libqhull/qh-merge.htm
similarity index 100%
rename from src/qh-merge.htm
rename to src/libqhull/qh-merge.htm
diff --git a/src/qh-poly.htm b/src/libqhull/qh-poly.htm
similarity index 100%
rename from src/qh-poly.htm
rename to src/libqhull/qh-poly.htm
diff --git a/src/qh-qhull.htm b/src/libqhull/qh-qhull.htm
similarity index 100%
rename from src/qh-qhull.htm
rename to src/libqhull/qh-qhull.htm
diff --git a/src/qh-set.htm b/src/libqhull/qh-set.htm
similarity index 100%
rename from src/qh-set.htm
rename to src/libqhull/qh-set.htm
diff --git a/src/qh-stat.htm b/src/libqhull/qh-stat.htm
similarity index 100%
rename from src/qh-stat.htm
rename to src/libqhull/qh-stat.htm
diff --git a/src/qh-user.htm b/src/libqhull/qh-user.htm
similarity index 100%
rename from src/qh-user.htm
rename to src/libqhull/qh-user.htm
diff --git a/src/qhull.h b/src/libqhull/qhull.h
similarity index 73%
rename from src/qhull.h
rename to src/libqhull/qhull.h
index 714d8e8..725b420 100644
--- a/src/qhull.h
+++ b/src/libqhull/qhull.h
@@ -6,8 +6,8 @@
    Proxy for libqhull.h for backwards compatability
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/qhull.h#51 $$Change: 1188 $
-   $DateTime: 2010/01/14 22:35:43 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/qhull.h#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #ifndef qhDEFqhull
diff --git a/src/qhull_a.h b/src/libqhull/qhull_a.h
similarity index 97%
rename from src/qhull_a.h
rename to src/libqhull/qhull_a.h
index 8bd2924..aaab5a9 100644
--- a/src/qhull_a.h
+++ b/src/libqhull/qhull_a.h
@@ -13,8 +13,8 @@
    defines internal functions for libqhull.c global.c
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/qhull_a.h#27 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/qhull_a.h#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 
    Notes:  grep for ((" and (" to catch fprintf("lkasdjf");
            full parens around (x?y:z)
diff --git a/src/qset.c b/src/libqhull/qset.c
similarity index 99%
rename from src/qset.c
rename to src/libqhull/qset.c
index 08082b4..33cd9f2 100644
--- a/src/qset.c
+++ b/src/libqhull/qset.c
@@ -7,8 +7,8 @@
    see qh-set.htm and qset.h
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/qset.c#29 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/qset.c#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #include "qset.h"
diff --git a/src/qset.h b/src/libqhull/qset.h
similarity index 99%
rename from src/qset.h
rename to src/libqhull/qset.h
index 611040b..6d5b7a1 100644
--- a/src/qset.h
+++ b/src/libqhull/qset.h
@@ -17,8 +17,8 @@
     - sets may be sorted or unsorted, the caller must distinguish this
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/qset.h#20 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/qset.h#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #ifndef qhDEFset
diff --git a/src/random.c b/src/libqhull/random.c
similarity index 100%
rename from src/random.c
rename to src/libqhull/random.c
diff --git a/src/random.h b/src/libqhull/random.h
similarity index 87%
rename from src/random.h
rename to src/libqhull/random.h
index 5a0ecd5..4fb9426 100644
--- a/src/random.h
+++ b/src/libqhull/random.h
@@ -7,8 +7,8 @@
    see qh-geom.htm and random.c
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/random.h#11 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/random.h#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #ifndef qhDEFrandom
diff --git a/src/rboxlib.c b/src/libqhull/rboxlib.c
similarity index 100%
rename from src/rboxlib.c
rename to src/libqhull/rboxlib.c
diff --git a/src/stat.c b/src/libqhull/stat.c
similarity index 99%
rename from src/stat.c
rename to src/libqhull/stat.c
index ac158c8..4304321 100644
--- a/src/stat.c
+++ b/src/libqhull/stat.c
@@ -7,8 +7,8 @@
    see qh-stat.htm and stat.h
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/stat.c#28 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/stat.c#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #include "qhull_a.h"
diff --git a/src/stat.h b/src/libqhull/stat.h
similarity index 99%
rename from src/stat.h
rename to src/libqhull/stat.h
index da06165..ab1a775 100644
--- a/src/stat.h
+++ b/src/libqhull/stat.h
@@ -7,8 +7,8 @@
    see qh-stat.htm and stat.c
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/stat.h#28 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/libqhull/stat.h#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 
    recompile qhull if you change this file
 
diff --git a/src/user.c b/src/libqhull/user.c
similarity index 100%
rename from src/user.c
rename to src/libqhull/user.c
diff --git a/src/user.h b/src/libqhull/user.h
similarity index 100%
rename from src/user.h
rename to src/libqhull/user.h
diff --git a/src/usermem.c b/src/libqhull/usermem.c
similarity index 100%
rename from src/usermem.c
rename to src/libqhull/usermem.c
diff --git a/src/userprintf.c b/src/libqhull/userprintf.c
similarity index 100%
rename from src/userprintf.c
rename to src/libqhull/userprintf.c
diff --git a/cpp/Coordinates.cpp b/src/libqhullcpp/Coordinates.cpp
similarity index 96%
rename from cpp/Coordinates.cpp
rename to src/libqhullcpp/Coordinates.cpp
index 8940fcb..bccce65 100644
--- a/cpp/Coordinates.cpp
+++ b/src/libqhullcpp/Coordinates.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/Coordinates.cpp#19 $$Change: 1150 $
-** $DateTime: 2010/01/04 22:43:14 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/Coordinates.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/Coordinates.h b/src/libqhullcpp/Coordinates.h
similarity index 99%
rename from cpp/Coordinates.h
rename to src/libqhullcpp/Coordinates.h
index 774fd48..58fcb2b 100644
--- a/cpp/Coordinates.h
+++ b/src/libqhullcpp/Coordinates.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/Coordinates.h#36 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/Coordinates.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/PointCoordinates.cpp b/src/libqhullcpp/PointCoordinates.cpp
similarity index 98%
rename from cpp/PointCoordinates.cpp
rename to src/libqhullcpp/PointCoordinates.cpp
index 38ded1e..2f871c8 100644
--- a/cpp/PointCoordinates.cpp
+++ b/src/libqhullcpp/PointCoordinates.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/PointCoordinates.cpp#23 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/PointCoordinates.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/PointCoordinates.h b/src/libqhullcpp/PointCoordinates.h
similarity index 98%
rename from cpp/PointCoordinates.h
rename to src/libqhullcpp/PointCoordinates.h
index 037a1ad..bc364a5 100644
--- a/cpp/PointCoordinates.h
+++ b/src/libqhullcpp/PointCoordinates.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/PointCoordinates.h#17 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/PointCoordinates.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/Qhull.cpp b/src/libqhullcpp/Qhull.cpp
similarity index 99%
rename from cpp/Qhull.cpp
rename to src/libqhullcpp/Qhull.cpp
index 61a2b55..8defd15 100644
--- a/cpp/Qhull.cpp
+++ b/src/libqhullcpp/Qhull.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/Qhull.cpp#47 $$Change: 1213 $
-** $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/Qhull.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/Qhull.h b/src/libqhullcpp/Qhull.h
similarity index 98%
rename from cpp/Qhull.h
rename to src/libqhullcpp/Qhull.h
index 2f69b21..0aa018d 100644
--- a/cpp/Qhull.h
+++ b/src/libqhullcpp/Qhull.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/Qhull.h#40 $$Change: 1213 $
-** $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/Qhull.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullError.cpp b/src/libqhullcpp/QhullError.cpp
similarity index 100%
rename from cpp/QhullError.cpp
rename to src/libqhullcpp/QhullError.cpp
diff --git a/cpp/QhullError.h b/src/libqhullcpp/QhullError.h
similarity index 94%
rename from cpp/QhullError.h
rename to src/libqhullcpp/QhullError.h
index 2f3e226..02168e7 100644
--- a/cpp/QhullError.h
+++ b/src/libqhullcpp/QhullError.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullError.h#34 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullError.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullEvent.cpp b/src/libqhullcpp/QhullEvent.cpp
similarity index 100%
rename from cpp/QhullEvent.cpp
rename to src/libqhullcpp/QhullEvent.cpp
diff --git a/cpp/QhullEvent.h b/src/libqhullcpp/QhullEvent.h
similarity index 93%
rename from cpp/QhullEvent.h
rename to src/libqhullcpp/QhullEvent.h
index 98c77e9..47817bb 100644
--- a/cpp/QhullEvent.h
+++ b/src/libqhullcpp/QhullEvent.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullEvent.h#9 $$Change: 1139 $
-** $DateTime: 2010/01/03 11:20:29 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullEvent.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullFacet.cpp b/src/libqhullcpp/QhullFacet.cpp
similarity index 99%
rename from cpp/QhullFacet.cpp
rename to src/libqhullcpp/QhullFacet.cpp
index eb306b1..37935f3 100644
--- a/cpp/QhullFacet.cpp
+++ b/src/libqhullcpp/QhullFacet.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacet.cpp#38 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacet.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullFacet.h b/src/libqhullcpp/QhullFacet.h
similarity index 98%
rename from cpp/QhullFacet.h
rename to src/libqhullcpp/QhullFacet.h
index 4d8bbe7..f2ea58b 100644
--- a/cpp/QhullFacet.h
+++ b/src/libqhullcpp/QhullFacet.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacet.h#38 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacet.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullFacetList.cpp b/src/libqhullcpp/QhullFacetList.cpp
similarity index 96%
rename from cpp/QhullFacetList.cpp
rename to src/libqhullcpp/QhullFacetList.cpp
index dce1efb..3b5b1e9 100644
--- a/cpp/QhullFacetList.cpp
+++ b/src/libqhullcpp/QhullFacetList.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacetList.cpp#24 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacetList.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullFacetList.h b/src/libqhullcpp/QhullFacetList.h
similarity index 96%
rename from cpp/QhullFacetList.h
rename to src/libqhullcpp/QhullFacetList.h
index d7dfb88..853861f 100644
--- a/cpp/QhullFacetList.h
+++ b/src/libqhullcpp/QhullFacetList.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacetList.h#26 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacetList.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullFacetSet.cpp b/src/libqhullcpp/QhullFacetSet.cpp
similarity index 96%
rename from cpp/QhullFacetSet.cpp
rename to src/libqhullcpp/QhullFacetSet.cpp
index 1bb320e..2b581ee 100644
--- a/cpp/QhullFacetSet.cpp
+++ b/src/libqhullcpp/QhullFacetSet.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacetSet.cpp#20 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacetSet.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullFacetSet.h b/src/libqhullcpp/QhullFacetSet.h
similarity index 96%
rename from cpp/QhullFacetSet.h
rename to src/libqhullcpp/QhullFacetSet.h
index fc66ec4..e23e3c1 100644
--- a/cpp/QhullFacetSet.h
+++ b/src/libqhullcpp/QhullFacetSet.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacetSet.h#24 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacetSet.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullHyperplane.cpp b/src/libqhullcpp/QhullHyperplane.cpp
similarity index 96%
rename from cpp/QhullHyperplane.cpp
rename to src/libqhullcpp/QhullHyperplane.cpp
index 946dbad..502c96e 100644
--- a/cpp/QhullHyperplane.cpp
+++ b/src/libqhullcpp/QhullHyperplane.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullHyperplane.cpp#12 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullHyperplane.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullHyperplane.h b/src/libqhullcpp/QhullHyperplane.h
similarity index 97%
rename from cpp/QhullHyperplane.h
rename to src/libqhullcpp/QhullHyperplane.h
index 29c9385..d75c4a7 100644
--- a/cpp/QhullHyperplane.h
+++ b/src/libqhullcpp/QhullHyperplane.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullHyperplane.h#14 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullHyperplane.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullIterator.h b/src/libqhullcpp/QhullIterator.h
similarity index 98%
rename from cpp/QhullIterator.h
rename to src/libqhullcpp/QhullIterator.h
index 5b03461..3badc7f 100644
--- a/cpp/QhullIterator.h
+++ b/src/libqhullcpp/QhullIterator.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullIterator.h#19 $$Change: 1139 $
-** $DateTime: 2010/01/03 11:20:29 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullIterator.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullLinkedList.h b/src/libqhullcpp/QhullLinkedList.h
similarity index 98%
rename from cpp/QhullLinkedList.h
rename to src/libqhullcpp/QhullLinkedList.h
index 4de29b0..dfc6870 100644
--- a/cpp/QhullLinkedList.h
+++ b/src/libqhullcpp/QhullLinkedList.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullLinkedList.h#34 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullLinkedList.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullLog.cpp b/src/libqhullcpp/QhullLog.cpp
similarity index 96%
rename from cpp/QhullLog.cpp
rename to src/libqhullcpp/QhullLog.cpp
index 613206e..61b0bcb 100644
--- a/cpp/QhullLog.cpp
+++ b/src/libqhullcpp/QhullLog.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullLog.cpp#11 $$Change: 1167 $
-** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullLog.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullLog.h b/src/libqhullcpp/QhullLog.h
similarity index 95%
rename from cpp/QhullLog.h
rename to src/libqhullcpp/QhullLog.h
index 1fb2b6a..81b8b5b 100644
--- a/cpp/QhullLog.h
+++ b/src/libqhullcpp/QhullLog.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullLog.h#12 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullLog.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullPoint.cpp b/src/libqhullcpp/QhullPoint.cpp
similarity index 97%
rename from cpp/QhullPoint.cpp
rename to src/libqhullcpp/QhullPoint.cpp
index d8ef470..a71f9b7 100644
--- a/cpp/QhullPoint.cpp
+++ b/src/libqhullcpp/QhullPoint.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPoint.cpp#30 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullPoint.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullPoint.h b/src/libqhullcpp/QhullPoint.h
similarity index 97%
rename from cpp/QhullPoint.h
rename to src/libqhullcpp/QhullPoint.h
index 097586c..61014b0 100644
--- a/cpp/QhullPoint.h
+++ b/src/libqhullcpp/QhullPoint.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPoint.h#35 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullPoint.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullPointSet.cpp b/src/libqhullcpp/QhullPointSet.cpp
similarity index 97%
rename from cpp/QhullPointSet.cpp
rename to src/libqhullcpp/QhullPointSet.cpp
index 52ceca7..8fd3d9c 100644
--- a/cpp/QhullPointSet.cpp
+++ b/src/libqhullcpp/QhullPointSet.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPointSet.cpp#11 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullPointSet.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullPointSet.h b/src/libqhullcpp/QhullPointSet.h
similarity index 98%
rename from cpp/QhullPointSet.h
rename to src/libqhullcpp/QhullPointSet.h
index b954cf4..563932e 100644
--- a/cpp/QhullPointSet.h
+++ b/src/libqhullcpp/QhullPointSet.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPointSet.h#21 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullPointSet.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullPoints.cpp b/src/libqhullcpp/QhullPoints.cpp
similarity index 97%
rename from cpp/QhullPoints.cpp
rename to src/libqhullcpp/QhullPoints.cpp
index 3d71534..5e8f0d4 100644
--- a/cpp/QhullPoints.cpp
+++ b/src/libqhullcpp/QhullPoints.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPoints.cpp#21 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullPoints.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullPoints.h b/src/libqhullcpp/QhullPoints.h
similarity index 99%
rename from cpp/QhullPoints.h
rename to src/libqhullcpp/QhullPoints.h
index 68265b6..d98c602 100644
--- a/cpp/QhullPoints.h
+++ b/src/libqhullcpp/QhullPoints.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPoints.h#32 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullPoints.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullQh.cpp b/src/libqhullcpp/QhullQh.cpp
similarity index 96%
rename from cpp/QhullQh.cpp
rename to src/libqhullcpp/QhullQh.cpp
index ef406f6..9e13505 100644
--- a/cpp/QhullQh.cpp
+++ b/src/libqhullcpp/QhullQh.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullQh.cpp#26 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullQh.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullQh.h b/src/libqhullcpp/QhullQh.h
similarity index 90%
rename from cpp/QhullQh.h
rename to src/libqhullcpp/QhullQh.h
index f4e1957..4c3ef82 100644
--- a/cpp/QhullQh.h
+++ b/src/libqhullcpp/QhullQh.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullQh.h#20 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullQh.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullRidge.cpp b/src/libqhullcpp/QhullRidge.cpp
similarity index 95%
rename from cpp/QhullRidge.cpp
rename to src/libqhullcpp/QhullRidge.cpp
index 550e8d8..a495003 100644
--- a/cpp/QhullRidge.cpp
+++ b/src/libqhullcpp/QhullRidge.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullRidge.cpp#18 $$Change: 1180 $
-** $DateTime: 2010/01/12 21:45:49 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullRidge.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullRidge.h b/src/libqhullcpp/QhullRidge.h
similarity index 96%
rename from cpp/QhullRidge.h
rename to src/libqhullcpp/QhullRidge.h
index 68f7ddf..877d737 100644
--- a/cpp/QhullRidge.h
+++ b/src/libqhullcpp/QhullRidge.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullRidge.h#25 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullRidge.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullSet.cpp b/src/libqhullcpp/QhullSet.cpp
similarity index 89%
rename from cpp/QhullSet.cpp
rename to src/libqhullcpp/QhullSet.cpp
index ebe3f87..bccc288 100644
--- a/cpp/QhullSet.cpp
+++ b/src/libqhullcpp/QhullSet.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullSet.cpp#21 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullSet.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullSet.h b/src/libqhullcpp/QhullSet.h
similarity index 98%
rename from cpp/QhullSet.h
rename to src/libqhullcpp/QhullSet.h
index 0a3ee5a..3d3174a 100644
--- a/cpp/QhullSet.h
+++ b/src/libqhullcpp/QhullSet.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullSet.h#39 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullSet.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullSets.h b/src/libqhullcpp/QhullSets.h
similarity index 83%
rename from cpp/QhullSets.h
rename to src/libqhullcpp/QhullSets.h
index e1b4593..a4bcf5c 100644
--- a/cpp/QhullSets.h
+++ b/src/libqhullcpp/QhullSets.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullSets.h#6 $$Change: 1139 $
-** $DateTime: 2010/01/03 11:20:29 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullSets.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullStat.cpp b/src/libqhullcpp/QhullStat.cpp
similarity index 85%
rename from cpp/QhullStat.cpp
rename to src/libqhullcpp/QhullStat.cpp
index 4ac347e..6560354 100644
--- a/cpp/QhullStat.cpp
+++ b/src/libqhullcpp/QhullStat.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullStat.cpp#9 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullStat.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullStat.h b/src/libqhullcpp/QhullStat.h
similarity index 90%
rename from cpp/QhullStat.h
rename to src/libqhullcpp/QhullStat.h
index 3c7f433..c2d71a1 100644
--- a/cpp/QhullStat.h
+++ b/src/libqhullcpp/QhullStat.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullStat.h#11 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullStat.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullVertex.cpp b/src/libqhullcpp/QhullVertex.cpp
similarity index 95%
rename from cpp/QhullVertex.cpp
rename to src/libqhullcpp/QhullVertex.cpp
index e4c9780..5431b7f 100644
--- a/cpp/QhullVertex.cpp
+++ b/src/libqhullcpp/QhullVertex.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullVertex.cpp#27 $$Change: 1213 $
-** $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullVertex.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullVertex.h b/src/libqhullcpp/QhullVertex.h
similarity index 96%
rename from cpp/QhullVertex.h
rename to src/libqhullcpp/QhullVertex.h
index 84510b0..f08843b 100644
--- a/cpp/QhullVertex.h
+++ b/src/libqhullcpp/QhullVertex.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullVertex.h#28 $$Change: 1213 $
-** $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullVertex.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullVertexSet.cpp b/src/libqhullcpp/QhullVertexSet.cpp
similarity index 95%
rename from cpp/QhullVertexSet.cpp
rename to src/libqhullcpp/QhullVertexSet.cpp
index c182026..cb96f03 100644
--- a/cpp/QhullVertexSet.cpp
+++ b/src/libqhullcpp/QhullVertexSet.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullVertexSet.cpp#8 $$Change: 1139 $
-** $DateTime: 2010/01/03 11:20:29 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullVertexSet.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/QhullVertexSet.h b/src/libqhullcpp/QhullVertexSet.h
similarity index 95%
rename from cpp/QhullVertexSet.h
rename to src/libqhullcpp/QhullVertexSet.h
index f609c93..cda347e 100644
--- a/cpp/QhullVertexSet.h
+++ b/src/libqhullcpp/QhullVertexSet.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullVertexSet.h#9 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullVertexSet.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/RboxPoints.cpp b/src/libqhullcpp/RboxPoints.cpp
similarity index 97%
rename from cpp/RboxPoints.cpp
rename to src/libqhullcpp/RboxPoints.cpp
index 04eb6fa..7f7ea77 100644
--- a/cpp/RboxPoints.cpp
+++ b/src/libqhullcpp/RboxPoints.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/RboxPoints.cpp#34 $$Change: 1167 $
-** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/RboxPoints.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/RboxPoints.h b/src/libqhullcpp/RboxPoints.h
similarity index 93%
rename from cpp/RboxPoints.h
rename to src/libqhullcpp/RboxPoints.h
index 72836f7..03c4fe8 100644
--- a/cpp/RboxPoints.h
+++ b/src/libqhullcpp/RboxPoints.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/RboxPoints.h#28 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/RboxPoints.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/UsingLibQhull.cpp b/src/libqhullcpp/UsingLibQhull.cpp
similarity index 98%
rename from cpp/UsingLibQhull.cpp
rename to src/libqhullcpp/UsingLibQhull.cpp
index 5e4b151..d6c1d60 100644
--- a/cpp/UsingLibQhull.cpp
+++ b/src/libqhullcpp/UsingLibQhull.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/UsingLibQhull.cpp#9 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/UsingLibQhull.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/UsingLibQhull.h b/src/libqhullcpp/UsingLibQhull.h
similarity index 97%
rename from cpp/UsingLibQhull.h
rename to src/libqhullcpp/UsingLibQhull.h
index f971b69..7b7e724 100644
--- a/cpp/UsingLibQhull.h
+++ b/src/libqhullcpp/UsingLibQhull.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/UsingLibQhull.h#7 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/UsingLibQhull.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/functionObjects.h b/src/libqhullcpp/functionObjects.h
similarity index 91%
rename from cpp/functionObjects.h
rename to src/libqhullcpp/functionObjects.h
index dd91a10..ccd1cda 100644
--- a/cpp/functionObjects.h
+++ b/src/libqhullcpp/functionObjects.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/functionObjects.h#8 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/functionObjects.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/project/libqhullcpp/libqhullcpp.pro b/src/libqhullcpp/libqhullcpp.pro
similarity index 100%
rename from project/libqhullcpp/libqhullcpp.pro
rename to src/libqhullcpp/libqhullcpp.pro
diff --git a/cpp/qhull_interface.cpp b/src/libqhullcpp/qhull_interface.cpp
similarity index 100%
rename from cpp/qhull_interface.cpp
rename to src/libqhullcpp/qhull_interface.cpp
diff --git a/cpp/qt-qhull.cpp b/src/libqhullcpp/qt-qhull.cpp
similarity index 95%
rename from cpp/qt-qhull.cpp
rename to src/libqhullcpp/qt-qhull.cpp
index 07887cd..7b71a83 100644
--- a/cpp/qt-qhull.cpp
+++ b/src/libqhullcpp/qt-qhull.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qt-qhull.cpp#2 $$Change: 1327 $
-** $DateTime: 2011/03/06 18:21:13 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/qt-qhull.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/project/libqhullp/libqhullp.pro b/src/libqhullp/libqhullp.pro
similarity index 100%
rename from project/libqhullp/libqhullp.pro
rename to src/libqhullp/libqhullp.pro
diff --git a/src/qconvex.c b/src/qconvex/qconvex.c
similarity index 100%
rename from src/qconvex.c
rename to src/qconvex/qconvex.c
diff --git a/project/qconvex/qconvex.pro b/src/qconvex/qconvex.pro
similarity index 100%
rename from project/qconvex/qconvex.pro
rename to src/qconvex/qconvex.pro
diff --git a/src/qdelaun.c b/src/qdelaunay/qdelaun.c
similarity index 100%
rename from src/qdelaun.c
rename to src/qdelaunay/qdelaun.c
diff --git a/project/qdelaunay/qdelaunay.pro b/src/qdelaunay/qdelaunay.pro
similarity index 100%
rename from project/qdelaunay/qdelaunay.pro
rename to src/qdelaunay/qdelaunay.pro
diff --git a/src/qhalf.c b/src/qhalf/qhalf.c
similarity index 100%
rename from src/qhalf.c
rename to src/qhalf/qhalf.c
diff --git a/project/qhalf/qhalf.pro b/src/qhalf/qhalf.pro
similarity index 100%
rename from project/qhalf/qhalf.pro
rename to src/qhalf/qhalf.pro
diff --git a/project/qhull-all.pro b/src/qhull-all.pro
similarity index 100%
rename from project/qhull-all.pro
rename to src/qhull-all.pro
diff --git a/project/qhull/qhull.pro b/src/qhull/qhull.pro
similarity index 100%
rename from project/qhull/qhull.pro
rename to src/qhull/qhull.pro
diff --git a/src/unix.c b/src/qhull/unix.c
similarity index 99%
rename from src/unix.c
rename to src/qhull/unix.c
index d0643ad..61822fa 100644
--- a/src/unix.c
+++ b/src/qhull/unix.c
@@ -8,8 +8,8 @@
    see qh-qhull.htm
 
    copyright (c) 1993-2010 The Geometry Center.
-   $Id: //product/qhull/main/rel/src/unix.c#26 $$Change: 1164 $
-   $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+   $Id: //main/2011/qhull/src/qhull/unix.c#1 $$Change: 1330 $
+   $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 */
 
 #include "mem.h"
diff --git a/cpp/qhulltest/Coordinates_test.cpp b/src/qhulltest/Coordinates_test.cpp
similarity index 98%
rename from cpp/qhulltest/Coordinates_test.cpp
rename to src/qhulltest/Coordinates_test.cpp
index 54b58c6..918fcf9 100644
--- a/cpp/qhulltest/Coordinates_test.cpp
+++ b/src/qhulltest/Coordinates_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/Coordinates_test.cpp#18 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/Coordinates_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/PointCoordinates_test.cpp b/src/qhulltest/PointCoordinates_test.cpp
similarity index 98%
rename from cpp/qhulltest/PointCoordinates_test.cpp
rename to src/qhulltest/PointCoordinates_test.cpp
index c936764..8227a77 100644
--- a/cpp/qhulltest/PointCoordinates_test.cpp
+++ b/src/qhulltest/PointCoordinates_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/PointCoordinates_test.cpp#16 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/PointCoordinates_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/Point_test.cpp b/src/qhulltest/Point_test.cpp
similarity index 97%
rename from cpp/qhulltest/Point_test.cpp
rename to src/qhulltest/Point_test.cpp
index e4f6979..259c00c 100644
--- a/cpp/qhulltest/Point_test.cpp
+++ b/src/qhulltest/Point_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (p) 2009-2010 p. Bradford Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/Point_test.cpp#12 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/Point_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/QhullFacetList_test.cpp b/src/qhulltest/QhullFacetList_test.cpp
similarity index 97%
rename from cpp/qhulltest/QhullFacetList_test.cpp
rename to src/qhulltest/QhullFacetList_test.cpp
index 1994c90..7dc1efe 100644
--- a/cpp/qhulltest/QhullFacetList_test.cpp
+++ b/src/qhulltest/QhullFacetList_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullFacetList_test.cpp#17 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullFacetList_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/QhullFacetSet_test.cpp b/src/qhulltest/QhullFacetSet_test.cpp
similarity index 96%
rename from cpp/qhulltest/QhullFacetSet_test.cpp
rename to src/qhulltest/QhullFacetSet_test.cpp
index 642a1d1..ca0c160 100644
--- a/cpp/qhulltest/QhullFacetSet_test.cpp
+++ b/src/qhulltest/QhullFacetSet_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullFacetSet_test.cpp#15 $$Change: 1179 $
-** $DateTime: 2010/01/12 19:53:15 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullFacetSet_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/QhullFacet_test.cpp b/src/qhulltest/QhullFacet_test.cpp
similarity index 98%
rename from cpp/qhulltest/QhullFacet_test.cpp
rename to src/qhulltest/QhullFacet_test.cpp
index e661620..fb61213 100644
--- a/cpp/qhulltest/QhullFacet_test.cpp
+++ b/src/qhulltest/QhullFacet_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullFacet_test.cpp#32 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullFacet_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/QhullHyperplane_test.cpp b/src/qhulltest/QhullHyperplane_test.cpp
similarity index 98%
rename from cpp/qhulltest/QhullHyperplane_test.cpp
rename to src/qhulltest/QhullHyperplane_test.cpp
index ac59a86..eef916d 100644
--- a/cpp/qhulltest/QhullHyperplane_test.cpp
+++ b/src/qhulltest/QhullHyperplane_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullHyperplane_test.cpp#12 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullHyperplane_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/QhullLinkedList_test.cpp b/src/qhulltest/QhullLinkedList_test.cpp
similarity index 98%
rename from cpp/qhulltest/QhullLinkedList_test.cpp
rename to src/qhulltest/QhullLinkedList_test.cpp
index 2e8c7fc..1beda7c 100644
--- a/cpp/qhulltest/QhullLinkedList_test.cpp
+++ b/src/qhulltest/QhullLinkedList_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (f) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullLinkedList_test.cpp#16 $$Change: 1179 $
-** $DateTime: 2010/01/12 19:53:15 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullLinkedList_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/QhullPointSet_test.cpp b/src/qhulltest/QhullPointSet_test.cpp
similarity index 98%
rename from cpp/qhulltest/QhullPointSet_test.cpp
rename to src/qhulltest/QhullPointSet_test.cpp
index 7f5c791..409733d 100644
--- a/cpp/qhulltest/QhullPointSet_test.cpp
+++ b/src/qhulltest/QhullPointSet_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (p) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullPointSet_test.cpp#10 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullPointSet_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/QhullPoint_test.cpp b/src/qhulltest/QhullPoint_test.cpp
similarity index 98%
rename from cpp/qhulltest/QhullPoint_test.cpp
rename to src/qhulltest/QhullPoint_test.cpp
index 03f5d4b..97515e9 100644
--- a/cpp/qhulltest/QhullPoint_test.cpp
+++ b/src/qhulltest/QhullPoint_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullPoint_test.cpp#17 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullPoint_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/QhullPoints_test.cpp b/src/qhulltest/QhullPoints_test.cpp
similarity index 98%
rename from cpp/qhulltest/QhullPoints_test.cpp
rename to src/qhulltest/QhullPoints_test.cpp
index 1def8ac..39bba80 100644
--- a/cpp/qhulltest/QhullPoints_test.cpp
+++ b/src/qhulltest/QhullPoints_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (p) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullPoints_test.cpp#19 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullPoints_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/QhullRidge_test.cpp b/src/qhulltest/QhullRidge_test.cpp
similarity index 96%
rename from cpp/qhulltest/QhullRidge_test.cpp
rename to src/qhulltest/QhullRidge_test.cpp
index 68ee138..f969ad4 100644
--- a/cpp/qhulltest/QhullRidge_test.cpp
+++ b/src/qhulltest/QhullRidge_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullRidge_test.cpp#12 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullRidge_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/QhullSet_test.cpp b/src/qhulltest/QhullSet_test.cpp
similarity index 98%
rename from cpp/qhulltest/QhullSet_test.cpp
rename to src/qhulltest/QhullSet_test.cpp
index b309c50..2146aee 100644
--- a/cpp/qhulltest/QhullSet_test.cpp
+++ b/src/qhulltest/QhullSet_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (f) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullSet_test.cpp#21 $$Change: 1179 $
-** $DateTime: 2010/01/12 19:53:15 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullSet_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/QhullVertexSet_test.cpp b/src/qhulltest/QhullVertexSet_test.cpp
similarity index 96%
rename from cpp/qhulltest/QhullVertexSet_test.cpp
rename to src/qhulltest/QhullVertexSet_test.cpp
index 5d65091..464d2eb 100644
--- a/cpp/qhulltest/QhullVertexSet_test.cpp
+++ b/src/qhulltest/QhullVertexSet_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullVertexSet_test.cpp#4 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullVertexSet_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/QhullVertex_test.cpp b/src/qhulltest/QhullVertex_test.cpp
similarity index 97%
rename from cpp/qhulltest/QhullVertex_test.cpp
rename to src/qhulltest/QhullVertex_test.cpp
index c0cc468..9b6a55b 100644
--- a/cpp/qhulltest/QhullVertex_test.cpp
+++ b/src/qhulltest/QhullVertex_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullVertex_test.cpp#13 $$Change: 1213 $
-** $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullVertex_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 //pre-compiled headers
diff --git a/cpp/qhulltest/Qhull_test.cpp b/src/qhulltest/Qhull_test.cpp
similarity index 98%
rename from cpp/qhulltest/Qhull_test.cpp
rename to src/qhulltest/Qhull_test.cpp
index bac814d..b072946 100644
--- a/cpp/qhulltest/Qhull_test.cpp
+++ b/src/qhulltest/Qhull_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/Qhull_test.cpp#41 $$Change: 1213 $
-** $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/Qhull_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/RboxPoints_test.cpp b/src/qhulltest/RboxPoints_test.cpp
similarity index 97%
rename from cpp/qhulltest/RboxPoints_test.cpp
rename to src/qhulltest/RboxPoints_test.cpp
index dd78394..20b89de 100644
--- a/cpp/qhulltest/RboxPoints_test.cpp
+++ b/src/qhulltest/RboxPoints_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2006-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/RboxPoints_test.cpp#20 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/RboxPoints_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 //pre-compiled headers
diff --git a/cpp/qhulltest/UsingLibQhull_test.cpp b/src/qhulltest/UsingLibQhull_test.cpp
similarity index 98%
rename from cpp/qhulltest/UsingLibQhull_test.cpp
rename to src/qhulltest/UsingLibQhull_test.cpp
index f5f8dda..fe3ea81 100644
--- a/cpp/qhulltest/UsingLibQhull_test.cpp
+++ b/src/qhulltest/UsingLibQhull_test.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/UsingLibQhull_test.cpp#7 $$Change: 1194 $
-** $DateTime: 2010/01/23 12:14:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/UsingLibQhull_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/cpp/qhulltest/qhulltest.cpp b/src/qhulltest/qhulltest.cpp
similarity index 94%
rename from cpp/qhulltest/qhulltest.cpp
rename to src/qhulltest/qhulltest.cpp
index dd20161..487e04a 100644
--- a/cpp/qhulltest/qhulltest.cpp
+++ b/src/qhulltest/qhulltest.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/qhulltest.cpp#56 $$Change: 1213 $
-** $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/qhulltest.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
 **
 ****************************************************************************/
 
diff --git a/project/qhulltest/qhulltest.pro b/src/qhulltest/qhulltest.pro
similarity index 100%
rename from project/qhulltest/qhulltest.pro
rename to src/qhulltest/qhulltest.pro
diff --git a/src/qvoronoi.c b/src/qvoronoi/qvoronoi.c
similarity index 100%
rename from src/qvoronoi.c
rename to src/qvoronoi/qvoronoi.c
diff --git a/project/qvoronoi/qvoronoi.pro b/src/qvoronoi/qvoronoi.pro
similarity index 100%
rename from project/qvoronoi/qvoronoi.pro
rename to src/qvoronoi/qvoronoi.pro
diff --git a/src/rbox.c b/src/rbox/rbox.c
similarity index 100%
rename from src/rbox.c
rename to src/rbox/rbox.c
diff --git a/project/rbox/rbox.pro b/src/rbox/rbox.pro
similarity index 100%
rename from project/rbox/rbox.pro
rename to src/rbox/rbox.pro
diff --git a/cpp/road/RoadError.cpp b/src/road/RoadError.cpp
similarity index 88%
rename from cpp/road/RoadError.cpp
rename to src/road/RoadError.cpp
index e944647..04fae1a 100644
--- a/cpp/road/RoadError.cpp
+++ b/src/road/RoadError.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/road/RoadError.cpp#17 $$Change: 1167 $
-** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/road/RoadError.cpp#2 $$Change: 1334 $
+** $DateTime: 2011/03/06 22:46:44 $$Author: bbarber $
 **
 ****************************************************************************/
 
@@ -44,10 +44,10 @@ RoadError()
 { }
 
 RoadError::
-RoadError(const RoadError &e)
-: error_code(e.error_code)
-, log_event(e.log_event)
-, error_message(e.error_message)
+RoadError(const RoadError &other)
+: error_code(other.error_code)
+, log_event(other.log_event)
+, error_message(other.error_message)
 {
 }//copy construct
 
@@ -124,11 +124,11 @@ RoadError(int code, const char *fmt, int d, int d2, float f, double e)
 { }
 
 RoadError & RoadError::
-operator=(const RoadError &e)
+operator=(const RoadError &other)
 {
-    error_code= e.error_code;
-    error_message= e.error_message;
-    log_event= e.log_event;
+    error_code= other.error_code;
+    error_message= other.error_message;
+    log_event= other.log_event;
     return *this;
 }//operator=
 
diff --git a/cpp/road/RoadError.h b/src/road/RoadError.h
similarity index 91%
rename from cpp/road/RoadError.h
rename to src/road/RoadError.h
index c1b5cc3..f98af9f 100644
--- a/cpp/road/RoadError.h
+++ b/src/road/RoadError.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/road/RoadError.h#23 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/road/RoadError.h#2 $$Change: 1334 $
+** $DateTime: 2011/03/06 22:46:44 $$Author: bbarber $
 **
 ****************************************************************************/
 
@@ -43,7 +43,7 @@ public:
 
 #//Constructors
     RoadError();
-    RoadError(const RoadError &e);  //! Called on throw, generates error_message
+    RoadError(const RoadError &other);  //! Called on throw, generates error_message
     RoadError(int code, const std::string &message);
     RoadError(int code, const char *fmt);
     RoadError(int code, const char *fmt, int d);
@@ -55,7 +55,7 @@ public:
     RoadError(int code, const char *fmt, int d, int d2, float f, long long i);
     RoadError(int code, const char *fmt, int d, int d2, float f, double e);
 
-    RoadError          &operator=(const RoadError&);
+    RoadError          &operator=(const RoadError &other);
                        ~RoadError() throw() {};
 
 #//Class methods
diff --git a/cpp/road/RoadLogEvent.cpp b/src/road/RoadLogEvent.cpp
similarity index 87%
rename from cpp/road/RoadLogEvent.cpp
rename to src/road/RoadLogEvent.cpp
index a81201b..071c3c7 100644
--- a/cpp/road/RoadLogEvent.cpp
+++ b/src/road/RoadLogEvent.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
-** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/road/RoadLogEvent.cpp#13 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** Copyright (C) 2008-2011 C.B. Barber. All rights reserved.
+** $Id: //main/2011/qhull/src/road/RoadLogEvent.cpp#1 $$Change: 1330 $
+** $Date: 2011/03/06 $$Author: bbarber $
 **
 ****************************************************************************/
 
@@ -24,7 +24,7 @@ using std::string;
 
 namespace orgQhull {
 
-#//Conversion
+#//!\name Conversion
 string RoadLogEvent::
 toString(const char *tag, int code) const
 {
@@ -80,6 +80,11 @@ toString(const char *tag, int code) const
                     os << cstr_1;
                 }
                 break;
+            case 'u':
+                if(firstExtraCode(os, c, &extraCode)){
+                    os << "0x" << std::hex << int64_1 << std::dec;
+                }
+                break;
             case 'x':
                 if(firstExtraCode(os, c, &extraCode)){
                     os << void_1;
diff --git a/cpp/road/RoadLogEvent.h b/src/road/RoadLogEvent.h
similarity index 94%
rename from cpp/road/RoadLogEvent.h
rename to src/road/RoadLogEvent.h
index bfe2cf6..9939c58 100644
--- a/cpp/road/RoadLogEvent.h
+++ b/src/road/RoadLogEvent.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/road/RoadLogEvent.h#12 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/road/RoadLogEvent.h#2 $$Change: 1334 $
+** $DateTime: 2011/03/06 22:46:44 $$Author: bbarber $
 **
 ****************************************************************************/
 
@@ -51,7 +51,7 @@ public:
     //! Default copy constructor and assignment
 
 #//GetSet
-    bool                defined() const { return format_string!=0; }
+    bool                isDefined() const { return format_string!=0; }
     int                 int1() const { return int_1; };
     int                 int2() const { return int_2; };
     float               float1() const { return float_1; };
diff --git a/cpp/road/RoadTest.cpp b/src/road/RoadTest.cpp
similarity index 87%
rename from cpp/road/RoadTest.cpp
rename to src/road/RoadTest.cpp
index d363c7f..ce3dce4 100644
--- a/cpp/road/RoadTest.cpp
+++ b/src/road/RoadTest.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
-** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/road/RoadTest.cpp#13 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** Copyright (C) 2008-2011 C.B. Barber. All rights reserved.
+** $Id: //main/2011/qhull/src/road/RoadTest.cpp#1 $$Change: 1330 $
+** $Date: 2011/03/06 $$Author: bbarber $
 **
 ****************************************************************************/
 
@@ -81,4 +81,4 @@ runTests(QStringList arguments)
 
 }//orgQhull
 
-#include "moc/moc_RoadTest.cpp"
+//! \todo -- got duplicate definitions #include "moc/moc_RoadTest.cpp"
diff --git a/cpp/road/RoadTest.h b/src/road/RoadTest.h
similarity index 78%
rename from cpp/road/RoadTest.h
rename to src/road/RoadTest.h
index dec711a..7b052eb 100644
--- a/cpp/road/RoadTest.h
+++ b/src/road/RoadTest.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
-** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/road/RoadTest.h#16 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** Copyright (C) 2008-2011 C.B. Barber. All rights reserved.
+** $Id: //main/2011/qhull/src/road/RoadTest.h#1 $$Change: 1330 $
+** $Date: 2011/03/06 $$Author: bbarber $
 **
 ****************************************************************************/
 
@@ -13,13 +13,12 @@
 #include <QObject>    // Qt C++ Framework
 #include <QtTest/QtTest>
 
-#ifndef QHULL_USES_QT
 #define QHULL_USES_QT 1
-#endif
 
 namespace orgQhull {
 
-#//Types
+#//!\name Defined here
+
     //! RoadTest -- Generic test for Qt's QTest
     class RoadTest;
     //! TESTadd_(t) -- Add a RoadTest
@@ -56,28 +55,28 @@ class RoadTest : public QObject
 {
     Q_OBJECT
 
+#//!\name Class globals
 protected:
-#//class variable
-    static QList<RoadTest*>
+    static QList<RoadTest *>
                         s_testcases; ///! List of testcases to execute.  Initialized via add_...()
     static int          s_test_count; ///! Total number of tests executed
     static int          s_test_fail; ///! Number of failed tests
     static QStringList  s_failed_tests; ///! List of failed tests
 
-#//Test slots
+#//!\name Test slots
 public slots:
     void cleanup();
 
 public:
-#//constructor, destructor
-    RoadTest()  { s_testcases.append(this); };
-    ~RoadTest() { s_testcases.removeAll(this); };
+#//!\name Constructors, etc.
+    RoadTest()  { s_testcases.append(this); }
+    ~RoadTest() { s_testcases.removeAll(this); }
 
 #//Helper
     void                recordFailedTest();
 
 
-#//class function
+#//!\name Class functions
     static int          runTests(QStringList arguments);
 
 };//RoadTest
@@ -87,7 +86,7 @@ public:
 
 }//orgQhull
 
-namespace QTest {
+namespace QTest{
 
 template<>
 inline char *
diff --git a/src/user_eg.c b/src/user_eg/user_eg.c
similarity index 100%
rename from src/user_eg.c
rename to src/user_eg/user_eg.c
diff --git a/project/user_eg/user_eg.pro b/src/user_eg/user_eg.pro
similarity index 100%
rename from project/user_eg/user_eg.pro
rename to src/user_eg/user_eg.pro
diff --git a/src/user_eg2.c b/src/user_eg2/user_eg2.c
similarity index 100%
rename from src/user_eg2.c
rename to src/user_eg2/user_eg2.c
diff --git a/project/user_eg2/user_eg2.pro b/src/user_eg2/user_eg2.pro
similarity index 100%
rename from project/user_eg2/user_eg2.pro
rename to src/user_eg2/user_eg2.pro
diff --git a/cpp/user_eg3.cpp b/src/user_eg3/user_eg3.cpp
similarity index 100%
rename from cpp/user_eg3.cpp
rename to src/user_eg3/user_eg3.cpp
diff --git a/project/user_eg3/user_eg3.pro b/src/user_eg3/user_eg3.pro
similarity index 100%
rename from project/user_eg3/user_eg3.pro
rename to src/user_eg3/user_eg3.pro
-- 
GitLab