diff --git a/facets/api/src/main/java/org/jboss/forge/addon/facets/BaseFacet.java b/facets/api/src/main/java/org/jboss/forge/facet/BaseFacet.java
similarity index 97%
rename from facets/api/src/main/java/org/jboss/forge/addon/facets/BaseFacet.java
rename to facets/api/src/main/java/org/jboss/forge/facet/BaseFacet.java
index 78cf79be80..43348476c9 100644
--- a/facets/api/src/main/java/org/jboss/forge/addon/facets/BaseFacet.java
+++ b/facets/api/src/main/java/org/jboss/forge/facet/BaseFacet.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.addon.facets;
+package org.jboss.forge.facet;
 
 /**
  * A base convenience {@link Facet} abstract class.
diff --git a/facets/api/src/main/java/org/jboss/forge/addon/facets/BaseFaceted.java b/facets/api/src/main/java/org/jboss/forge/facet/BaseFaceted.java
similarity index 98%
rename from facets/api/src/main/java/org/jboss/forge/addon/facets/BaseFaceted.java
rename to facets/api/src/main/java/org/jboss/forge/facet/BaseFaceted.java
index b6fde1d89a..c0d35a446a 100644
--- a/facets/api/src/main/java/org/jboss/forge/addon/facets/BaseFaceted.java
+++ b/facets/api/src/main/java/org/jboss/forge/facet/BaseFaceted.java
@@ -1,4 +1,4 @@
-package org.jboss.forge.addon.facets;
+package org.jboss.forge.facet;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/facets/api/src/main/java/org/jboss/forge/addon/facets/Facet.java b/facets/api/src/main/java/org/jboss/forge/facet/Facet.java
similarity index 97%
rename from facets/api/src/main/java/org/jboss/forge/addon/facets/Facet.java
rename to facets/api/src/main/java/org/jboss/forge/facet/Facet.java
index 39ae965981..7e2cc03d3a 100644
--- a/facets/api/src/main/java/org/jboss/forge/addon/facets/Facet.java
+++ b/facets/api/src/main/java/org/jboss/forge/facet/Facet.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.addon.facets;
+package org.jboss.forge.facet;
 
 /**
  * A {@link Facet} is an access point to common functionality, file manipulations, descriptors that extend a
diff --git a/facets/api/src/main/java/org/jboss/forge/addon/facets/FacetNotFoundException.java b/facets/api/src/main/java/org/jboss/forge/facet/FacetNotFoundException.java
similarity index 95%
rename from facets/api/src/main/java/org/jboss/forge/addon/facets/FacetNotFoundException.java
rename to facets/api/src/main/java/org/jboss/forge/facet/FacetNotFoundException.java
index 221bab9d3c..971b36b48d 100644
--- a/facets/api/src/main/java/org/jboss/forge/addon/facets/FacetNotFoundException.java
+++ b/facets/api/src/main/java/org/jboss/forge/facet/FacetNotFoundException.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.addon.facets;
+package org.jboss.forge.facet;
 
 /**
  * An exception representing the state where a facet was requested, but was not available.
diff --git a/facets/api/src/main/java/org/jboss/forge/addon/facets/Faceted.java b/facets/api/src/main/java/org/jboss/forge/facet/Faceted.java
similarity index 98%
rename from facets/api/src/main/java/org/jboss/forge/addon/facets/Faceted.java
rename to facets/api/src/main/java/org/jboss/forge/facet/Faceted.java
index 18797ae7ca..68a898ed29 100644
--- a/facets/api/src/main/java/org/jboss/forge/addon/facets/Faceted.java
+++ b/facets/api/src/main/java/org/jboss/forge/facet/Faceted.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.addon.facets;
+package org.jboss.forge.facet;
 
 /**
  * @author <a href="http://community.jboss.org/people/kenfinni">Ken Finnigan</a>
diff --git a/facets/api/src/test/java/org/jboss/forge/addon/facets/BaseFacetedTest.java b/facets/api/src/test/java/org/jboss/forge/addon/facets/BaseFacetedTest.java
index 6f0355b195..df598278c0 100644
--- a/facets/api/src/test/java/org/jboss/forge/addon/facets/BaseFacetedTest.java
+++ b/facets/api/src/test/java/org/jboss/forge/addon/facets/BaseFacetedTest.java
@@ -4,6 +4,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.jboss.forge.facet.Facet;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/facets/api/src/test/java/org/jboss/forge/addon/facets/MockFacet.java b/facets/api/src/test/java/org/jboss/forge/addon/facets/MockFacet.java
index 21dc808c3a..dfe1107122 100644
--- a/facets/api/src/test/java/org/jboss/forge/addon/facets/MockFacet.java
+++ b/facets/api/src/test/java/org/jboss/forge/addon/facets/MockFacet.java
@@ -1,5 +1,7 @@
 package org.jboss.forge.addon.facets;
 
+import org.jboss.forge.facet.BaseFacet;
+
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
diff --git a/facets/api/src/test/java/org/jboss/forge/addon/facets/MockFacet2.java b/facets/api/src/test/java/org/jboss/forge/addon/facets/MockFacet2.java
index 165f1983e3..22547cf303 100644
--- a/facets/api/src/test/java/org/jboss/forge/addon/facets/MockFacet2.java
+++ b/facets/api/src/test/java/org/jboss/forge/addon/facets/MockFacet2.java
@@ -1,5 +1,7 @@
 package org.jboss.forge.addon.facets;
 
+import org.jboss.forge.facet.BaseFacet;
+
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
diff --git a/facets/api/src/test/java/org/jboss/forge/addon/facets/MockFaceted.java b/facets/api/src/test/java/org/jboss/forge/addon/facets/MockFaceted.java
index 8e7b20431c..392814c4df 100644
--- a/facets/api/src/test/java/org/jboss/forge/addon/facets/MockFaceted.java
+++ b/facets/api/src/test/java/org/jboss/forge/addon/facets/MockFaceted.java
@@ -1,5 +1,8 @@
 package org.jboss.forge.addon.facets;
 
+import org.jboss.forge.facet.BaseFaceted;
+import org.jboss.forge.facet.Facet;
+
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
diff --git a/resources/api/src/main/java/org/jboss/forge/resource/AbstractResource.java b/resources/api/src/main/java/org/jboss/forge/resource/AbstractResource.java
index bfd856b9f4..16e7517113 100644
--- a/resources/api/src/main/java/org/jboss/forge/resource/AbstractResource.java
+++ b/resources/api/src/main/java/org/jboss/forge/resource/AbstractResource.java
@@ -11,8 +11,8 @@
 import java.util.Comparator;
 import java.util.List;
 
-import org.jboss.forge.addon.facets.BaseFaceted;
-import org.jboss.forge.addon.facets.Faceted;
+import org.jboss.forge.facet.BaseFaceted;
+import org.jboss.forge.facet.Faceted;
 
 /**
  * @author Mike Brock <cbrock@redhat.com>
diff --git a/resources/api/src/main/java/org/jboss/forge/resource/DirectoryResource.java b/resources/api/src/main/java/org/jboss/forge/resource/DirectoryResource.java
index 4d30090505..1262ed3064 100644
--- a/resources/api/src/main/java/org/jboss/forge/resource/DirectoryResource.java
+++ b/resources/api/src/main/java/org/jboss/forge/resource/DirectoryResource.java
@@ -12,7 +12,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.jboss.forge.addon.facets.Facet;
+import org.jboss.forge.facet.Facet;
 
 /**
  * A standard, build-in, resource for representing directories on the file-system.
diff --git a/resources/api/src/main/java/org/jboss/forge/resource/Resource.java b/resources/api/src/main/java/org/jboss/forge/resource/Resource.java
index 997310fda3..6866e7b1a7 100644
--- a/resources/api/src/main/java/org/jboss/forge/resource/Resource.java
+++ b/resources/api/src/main/java/org/jboss/forge/resource/Resource.java
@@ -9,7 +9,7 @@
 import java.io.InputStream;
 import java.util.List;
 
-import org.jboss.forge.addon.facets.Faceted;
+import org.jboss.forge.facet.Faceted;
 
 /**
  * A Resource is an abstraction on top of usable items within a Forge project. For instance, files, source code, etc.
diff --git a/resources/api/src/main/java/org/jboss/forge/resource/URLResource.java b/resources/api/src/main/java/org/jboss/forge/resource/URLResource.java
index c14f1049b4..7fb0619813 100644
--- a/resources/api/src/main/java/org/jboss/forge/resource/URLResource.java
+++ b/resources/api/src/main/java/org/jboss/forge/resource/URLResource.java
@@ -4,7 +4,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jboss.forge.addon.facets.Facet;
+import org.jboss.forge.facet.Facet;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
diff --git a/resources/api/src/main/java/org/jboss/forge/resource/UnknownFileResource.java b/resources/api/src/main/java/org/jboss/forge/resource/UnknownFileResource.java
index d129479a58..8007c668d5 100644
--- a/resources/api/src/main/java/org/jboss/forge/resource/UnknownFileResource.java
+++ b/resources/api/src/main/java/org/jboss/forge/resource/UnknownFileResource.java
@@ -11,7 +11,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jboss.forge.addon.facets.Facet;
+import org.jboss.forge.facet.Facet;
 
 /**
  * Represents any regular file which Forge does not hav any special handler for.
diff --git a/resources/impl/src/main/java/org/jboss/forge/resource/UnknownFileResource.java b/resources/impl/src/main/java/org/jboss/forge/resource/UnknownFileResource.java
index 8015d98616..cb0c28aafd 100644
--- a/resources/impl/src/main/java/org/jboss/forge/resource/UnknownFileResource.java
+++ b/resources/impl/src/main/java/org/jboss/forge/resource/UnknownFileResource.java
@@ -4,7 +4,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jboss.forge.addon.facets.Facet;
+import org.jboss.forge.facet.Facet;
 
 public class UnknownFileResource extends FileResource<UnknownFileResource>
 {
diff --git a/resources/impl/src/test/java/org/jboss/forge/test/resource/MockStringResource.java b/resources/impl/src/test/java/org/jboss/forge/test/resource/MockStringResource.java
index e97f2f1686..cfbd229552 100644
--- a/resources/impl/src/test/java/org/jboss/forge/test/resource/MockStringResource.java
+++ b/resources/impl/src/test/java/org/jboss/forge/test/resource/MockStringResource.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.jboss.forge.addon.facets.Facet;
+import org.jboss.forge.facet.Facet;
 import org.jboss.forge.resource.Resource;
 import org.jboss.forge.resource.ResourceFactory;
 import org.jboss.forge.resource.VirtualResource;