diff -u -r1.4 -r1.5
--- CylindricalBarrelCalorimeterConverter.java	20 Mar 2007 21:19:59 -0000	1.4
+++ CylindricalBarrelCalorimeterConverter.java	5 Apr 2007 23:24:21 -0000	1.5
@@ -11,8 +11,8 @@

 import org.lcsim.detector.material.IMaterial;
 import org.lcsim.detector.material.MaterialStore;
 import org.lcsim.detector.solids.Tube;

-import org.lcsim.geometry.Detector;
-import org.lcsim.geometry.Subdetector;

+import org.lcsim.geometry.compact.Detector;
+import org.lcsim.geometry.compact.Subdetector;

 import org.lcsim.geometry.layer.Layer;
 import org.lcsim.geometry.layer.LayerSlice;
 import org.lcsim.geometry.layer.Layering;

diff -u -r1.4 -r1.5
--- CylindricalEndcapCalorimeterConverter.java	24 Mar 2007 01:02:50 -0000	1.4
+++ CylindricalEndcapCalorimeterConverter.java	5 Apr 2007 23:24:21 -0000	1.5
@@ -12,8 +12,8 @@

 import org.lcsim.detector.material.IMaterial;
 import org.lcsim.detector.material.MaterialStore;
 import org.lcsim.detector.solids.Tube;

-import org.lcsim.geometry.Detector;
-import org.lcsim.geometry.Subdetector;

+import org.lcsim.geometry.compact.Detector;
+import org.lcsim.geometry.compact.Subdetector;

 import org.lcsim.geometry.layer.Layer;
 import org.lcsim.geometry.layer.LayerSlice;
 import org.lcsim.geometry.layer.Layering;

diff -u -r1.5 -r1.6
--- DiskTrackerConverter.java	30 Mar 2007 23:43:35 -0000	1.5
+++ DiskTrackerConverter.java	5 Apr 2007 23:24:21 -0000	1.6
@@ -11,8 +11,8 @@

 import org.lcsim.detector.material.IMaterial;
 import org.lcsim.detector.material.MaterialStore;
 import org.lcsim.detector.solids.Tube;

-import org.lcsim.geometry.Detector;
-import org.lcsim.geometry.Subdetector;

+import org.lcsim.geometry.compact.Detector;
+import org.lcsim.geometry.compact.Subdetector;

 import org.lcsim.geometry.layer.Layer;
 import org.lcsim.geometry.layer.LayerSlice;
 import org.lcsim.geometry.layer.Layering;

diff -u -r1.2 -r1.3
--- ISubdetectorConverter.java	17 Mar 2007 00:10:41 -0000	1.2
+++ ISubdetectorConverter.java	5 Apr 2007 23:24:21 -0000	1.3
@@ -1,7 +1,10 @@

 package org.lcsim.detector.converter.compact;
 

-import org.lcsim.geometry.Detector;
-import org.lcsim.geometry.Subdetector;

+import org.lcsim.geometry.compact.Detector;
+import org.lcsim.geometry.compact.Subdetector;
+
+//import org.lcsim.geometry.Detector;
+//import org.lcsim.geometry.Subdetector;

 
 public interface ISubdetectorConverter
 {

diff -u -r1.2 -r1.3
--- MultiLayerTrackerConverter.java	24 Mar 2007 01:23:45 -0000	1.2
+++ MultiLayerTrackerConverter.java	5 Apr 2007 23:24:21 -0000	1.3
@@ -7,8 +7,8 @@

 import org.lcsim.detector.material.IMaterial;
 import org.lcsim.detector.material.MaterialStore;
 import org.lcsim.detector.solids.Tube;

-import org.lcsim.geometry.Detector;
-import org.lcsim.geometry.Subdetector;

+import org.lcsim.geometry.compact.Detector;
+import org.lcsim.geometry.compact.Subdetector;

 import org.lcsim.geometry.layer.Layer;
 import org.lcsim.geometry.layer.LayerSlice;
 import org.lcsim.geometry.layer.Layering;

diff -u -r1.1 -r1.2
--- SiTrackerBarrelConverter.java	3 Apr 2007 01:45:59 -0000	1.1
+++ SiTrackerBarrelConverter.java	5 Apr 2007 23:24:21 -0000	1.2
@@ -23,8 +23,8 @@

 import org.lcsim.detector.solids.Box;
 import org.lcsim.detector.solids.ISolid;
 import org.lcsim.detector.solids.Tube;

-import org.lcsim.geometry.Detector;
-import org.lcsim.geometry.Subdetector;

+import org.lcsim.geometry.compact.Detector;
+import org.lcsim.geometry.compact.Subdetector;

 import org.lcsim.geometry.subdetector.SiTrackerBarrel;
 
 public class SiTrackerBarrelConverter