diff -u -r1.22 -r1.23
--- IDetectorElement.java	10 Oct 2007 22:35:44 -0000	1.22
+++ IDetectorElement.java	15 May 2008 22:06:12 -0000	1.23
@@ -4,7 +4,7 @@

 
 import java.util.List;
 

-import org.lcsim.detector.identifier.IIdentifiable;

+import org.lcsim.detector.identifier.Identifiable;

 import org.lcsim.detector.identifier.IIdentifier;
 import org.lcsim.detector.identifier.IIdentifierHelper;
 

@@ -19,17 +19,17 @@

  * @see IDetectorElementStore
  * @see IDetectorElementContainer
  * @see IGeometryInfo

- * @see IIdentifiable

+ * @see Identifiable

  * @see IIdentifier
  * @see IParameters
  * @see IReadout
  * 
  * @author jeremym
  * @author tknelson

- * @version $Id: IDetectorElement.java,v 1.22 2007/10/10 22:35:44 jeremy Exp $

+ * @version $Id: IDetectorElement.java,v 1.23 2008/05/15 22:06:12 jeremy Exp $

  */
 public interface IDetectorElement

-extends IIdentifiable

+extends Identifiable

 {
 	/**
 	 * Get the geometric information for this node,

diff -N Identifiable.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Identifiable.java	15 May 2008 22:06:12 -0000	1.1
@@ -0,0 +1,33 @@

+package org.lcsim.detector.identifier;
+
+/**
+ * A mixin interface for objects that have an associated {@link IIdentifier},
+ * {@link IExpandedIdentifier}, and an {@link IIdentifierHelper}
+ * for performing converting between these.
+ *  
+ * @author Jeremy McCormick
+ * @version $Id: Identifiable.java,v 1.1 2008/05/15 22:06:12 jeremy Exp $
+ */
+public interface Identifiable 
+{
+    /**
+     * Get the {@link IIdentifier} associated with this object.
+     * @return The Identifier.
+     */
+    public IIdentifier getIdentifier();
+    
+    /**
+     * Get the {@link IExpandedIdentifier} associated with this object.
+     * Should use {@link IIdentifierHelper} to unpack the 
+     * {@link IIdentifier}.
+     * 
+     * @return The ExpandedIdentifier.
+     */
+    public IExpandedIdentifier getExpandedIdentifier();   
+    
+    /**
+     * Get the {@link IIdentifierHelper} associated with this object. 
+     * @return The IdentifierHelper.
+     */
+    public IIdentifierHelper getIdentifierHelper();
+}

diff -N IIdentifiable.java
--- IIdentifiable.java	28 Aug 2007 22:25:46 -0000	1.7
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@

-package org.lcsim.detector.identifier;
-
-/**
- * A mix-in interface for objects that have an associated {@link IIdentifier},
- * corresponding {@link IExpandedIdentifier}, and an {@link IIdentifierHelper}
- * for performing pack and unpack operations on these objects.
- *  
- * @author Jeremy McCormick
- * @version $Id: IIdentifiable.java,v 1.7 2007/08/28 22:25:46 jeremy Exp $
- */
-public interface IIdentifiable 
-{
-    /**
-     * Get the {@link IIdentifier} associated with this object.
-     * @return The Identifier.
-     */
-    public IIdentifier getIdentifier();
-    
-    /**
-     * Get the {@link IExpandedIdentifier} associated with this object.
-     * Should use {@link IIdentifierHelper} to unpack the 
-     * {@link IIdentifier}.
-     * 
-     * @return The ExpandedIdentifier.
-     */
-    public IExpandedIdentifier getExpandedIdentifier();   
-    
-    /**
-     * Get the {@link IIdentifierHelper} associated with this object. 
-     * @return The IdentifierHelper.
-     */
-    public IIdentifierHelper getIdentifierHelper();
-}