diff -u -r1.3 -r1.4
--- SiD02ReconHybridHitMaker.java	15 Nov 2008 02:51:43 -0000	1.3
+++ SiD02ReconHybridHitMaker.java	6 Dec 2008 21:53:36 -0000	1.4
@@ -7,16 +7,16 @@

 
 package org.lcsim.recon.tracking.seedtracker.ReconTracking;
 

-import org.lcsim.contrib.onoprien.tracking.clustering.ClusteringDriver;
-import org.lcsim.contrib.onoprien.tracking.clustering.clusterers.NearestNeighborClusterer;
-import org.lcsim.contrib.onoprien.tracking.digitization.SimToDigiConverter;
-import org.lcsim.contrib.onoprien.tracking.digitization.SimToDigiDriver;
-import org.lcsim.contrib.onoprien.tracking.digitization.algorithms.ConverterSimple;
-import org.lcsim.contrib.onoprien.tracking.geom.SegmentationManager;
-import org.lcsim.contrib.onoprien.tracking.geom.Segmenter;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.HitMakingDriver;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.TrackerHitMaker;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.hitmakers.TrackerHitMakerBasic;

+import org.lcsim.recon.tracking.vsegment.clustering.ClusteringDriver;
+import org.lcsim.recon.tracking.vsegment.clustering.clusterers.NearestNeighborClusterer;
+import org.lcsim.recon.tracking.vsegment.digitization.SimToDigiConverter;
+import org.lcsim.recon.tracking.vsegment.digitization.SimToDigiDriver;
+import org.lcsim.recon.tracking.vsegment.digitization.algorithms.ConverterSimple;
+import org.lcsim.recon.tracking.vsegment.geom.SegmentationManager;
+import org.lcsim.recon.tracking.vsegment.geom.Segmenter;
+import org.lcsim.recon.tracking.vsegment.hitmaking.HitMakingDriver;
+import org.lcsim.recon.tracking.vsegment.hitmaking.TrackerHitMaker;
+import org.lcsim.recon.tracking.vsegment.hitmaking.hitmakers.TrackerHitMakerBasic;

 import org.lcsim.fit.helicaltrack.HelicalTrackHitDriver;
 import org.lcsim.fit.helicaltrack.HelicalTrackHitDriver.HitType;
 import org.lcsim.mc.CCDSim.FullCCDSimulation;

diff -u -r1.1 -r1.2
--- SiD02ReconSegmenter.java	16 Oct 2008 21:41:18 -0000	1.1
+++ SiD02ReconSegmenter.java	6 Dec 2008 21:53:36 -0000	1.2
@@ -7,17 +7,17 @@

 
 package org.lcsim.recon.tracking.seedtracker.ReconTracking;
 

-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.CylindricalBarrelSegmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.DiskTrackerToRingsSegmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.DiskTrackerToWedgesSegmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.SubdetectorBasedSegmenter;

+import org.lcsim.recon.tracking.vsegment.geom.segmenters.CylindricalBarrelSegmenter;
+import org.lcsim.recon.tracking.vsegment.geom.segmenters.DiskTrackerToRingsSegmenter;
+import org.lcsim.recon.tracking.vsegment.geom.segmenters.DiskTrackerToWedgesSegmenter;
+import org.lcsim.recon.tracking.vsegment.geom.segmenters.SubdetectorBasedSegmenter;

 import org.lcsim.units.clhep.SystemOfUnits;
 
 /**
  *  Segmenter for SiD02 LOI tracking reconstruction.
  * 
  * @author C. Deaconu and R. Partridge (based on example from D. Onoprienko)

- * @version $Id: SiD02ReconSegmenter.java,v 1.1 2008/10/16 21:41:18 partridge Exp $

+ * @version $Id: SiD02ReconSegmenter.java,v 1.2 2008/12/06 21:53:36 onoprien Exp $

  */
 public class SiD02ReconSegmenter extends SubdetectorBasedSegmenter {
     

diff -u -r1.1 -r1.2
--- VSExampleDriver.java	27 Aug 2008 17:56:36 -0000	1.1
+++ VSExampleDriver.java	6 Dec 2008 21:53:36 -0000	1.2
@@ -13,25 +13,25 @@

 import hep.physics.vec.Hep3Vector;
 import hep.physics.vec.VecOp;
 

-import org.lcsim.contrib.onoprien.tracking.clustering.ClusteringDriver;
-import org.lcsim.contrib.onoprien.tracking.clustering.clusterers.NearestNeighborClusterer;
-import org.lcsim.contrib.onoprien.tracking.digitization.SimToDigiDriver;
-import org.lcsim.contrib.onoprien.tracking.digitization.SimToDigiConverter;
-import org.lcsim.contrib.onoprien.tracking.digitization.algorithms.ConverterSimple;
-import org.lcsim.contrib.onoprien.tracking.geom.SegmentationManager;
-import org.lcsim.contrib.onoprien.tracking.geom.Segmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.Sensor;
-import org.lcsim.contrib.onoprien.tracking.geom.SensorType;
-import org.lcsim.contrib.onoprien.tracking.hit.DigiTrackerHit;
-import org.lcsim.contrib.onoprien.tracking.hit.TrackerCluster;
-import org.lcsim.contrib.onoprien.tracking.hit.TrackerHit;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.HitMakingDriver;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.TrackerHitConverter;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.TrackerHitMaker;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.hitmakers.TrackerHitMakerBasic;
-import org.lcsim.contrib.onoprien.tracking.mctruth.MCTruth;
-import org.lcsim.contrib.onoprien.tracking.mctruth.MCTruthDriver;
-import org.lcsim.contrib.onoprien.tracking.mctruth.SimGroup;

+import org.lcsim.recon.tracking.vsegment.clustering.ClusteringDriver;
+import org.lcsim.recon.tracking.vsegment.clustering.clusterers.NearestNeighborClusterer;
+import org.lcsim.recon.tracking.vsegment.digitization.SimToDigiDriver;
+import org.lcsim.recon.tracking.vsegment.digitization.SimToDigiConverter;
+import org.lcsim.recon.tracking.vsegment.digitization.algorithms.ConverterSimple;
+import org.lcsim.recon.tracking.vsegment.geom.SegmentationManager;
+import org.lcsim.recon.tracking.vsegment.geom.Segmenter;
+import org.lcsim.recon.tracking.vsegment.geom.Sensor;
+import org.lcsim.recon.tracking.vsegment.geom.SensorType;
+import org.lcsim.recon.tracking.vsegment.hit.DigiTrackerHit;
+import org.lcsim.recon.tracking.vsegment.hit.TrackerCluster;
+import org.lcsim.recon.tracking.vsegment.hit.TrackerHit;
+import org.lcsim.recon.tracking.vsegment.hitmaking.HitMakingDriver;
+import org.lcsim.recon.tracking.vsegment.hitmaking.TrackerHitConverter;
+import org.lcsim.recon.tracking.vsegment.hitmaking.TrackerHitMaker;
+import org.lcsim.recon.tracking.vsegment.hitmaking.hitmakers.TrackerHitMakerBasic;
+import org.lcsim.recon.tracking.vsegment.mctruth.MCTruth;
+import org.lcsim.recon.tracking.vsegment.mctruth.MCTruthDriver;
+import org.lcsim.recon.tracking.vsegment.mctruth.SimGroup;

 
 /**
  * An Example of how to define virtual segmentation of the tracker, 

@@ -42,7 +42,7 @@

  * 
  * 
  * @author D. Onoprienko

- * @version $Id: VSExampleDriver.java,v 1.1 2008/08/27 17:56:36 partridge Exp $

+ * @version $Id: VSExampleDriver.java,v 1.2 2008/12/06 21:53:36 onoprien Exp $

  */
 public class VSExampleDriver extends Driver {
   

diff -u -r1.1 -r1.2
--- VSExampleSegmenter.java	27 Aug 2008 17:56:36 -0000	1.1
+++ VSExampleSegmenter.java	6 Dec 2008 21:53:36 -0000	1.2
@@ -2,10 +2,10 @@

 
 import org.lcsim.units.clhep.SystemOfUnits;
 

-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.CylindricalBarrelSegmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.DiskTrackerToWedgesSegmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.DiskTrackerToRingsSegmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.SubdetectorBasedSegmenter;

+import org.lcsim.recon.tracking.vsegment.geom.segmenters.CylindricalBarrelSegmenter;
+import org.lcsim.recon.tracking.vsegment.geom.segmenters.DiskTrackerToWedgesSegmenter;
+import org.lcsim.recon.tracking.vsegment.geom.segmenters.DiskTrackerToRingsSegmenter;
+import org.lcsim.recon.tracking.vsegment.geom.segmenters.SubdetectorBasedSegmenter;

 
 /**
  * 

@@ -13,7 +13,7 @@

  * 
  * 
  * @author D. Onoprienko

- * @version $Id: VSExampleSegmenter.java,v 1.1 2008/08/27 17:56:36 partridge Exp $

+ * @version $Id: VSExampleSegmenter.java,v 1.2 2008/12/06 21:53:36 onoprien Exp $

  */
 public class VSExampleSegmenter extends SubdetectorBasedSegmenter {