diff --git a/ipojo/bnd-ipojo-plugin/.classpath b/ipojo/bnd-ipojo-plugin/.classpath
new file mode 100644
index 0000000..f9479ba
--- /dev/null
+++ b/ipojo/bnd-ipojo-plugin/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/ipojo/bnd-ipojo-plugin/.project b/ipojo/bnd-ipojo-plugin/.project
new file mode 100644
index 0000000..f064da4
--- /dev/null
+++ b/ipojo/bnd-ipojo-plugin/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>bnd-ipojo-plugin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/ipojo/bnd-ipojo-plugin/.settings/org.eclipse.jdt.core.prefs b/ipojo/bnd-ipojo-plugin/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..b12d728
--- /dev/null
+++ b/ipojo/bnd-ipojo-plugin/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,6 @@
+#Sat Aug 20 14:54:18 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/ipojo/bnd-ipojo-plugin/.settings/org.eclipse.m2e.core.prefs b/ipojo/bnd-ipojo-plugin/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..7fe79be
--- /dev/null
+++ b/ipojo/bnd-ipojo-plugin/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,5 @@
+#Sat Aug 20 14:54:08 CEST 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndJarResourceStore.java b/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndJarResourceStore.java
index 7d666f2..68432e3 100644
--- a/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndJarResourceStore.java
+++ b/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndJarResourceStore.java
@@ -37,13 +37,6 @@
 import java.io.InputStream;
 import java.util.*;
 
-/**
- * Created by IntelliJ IDEA.
- * User: guillaume
- * Date: 11/08/11
- * Time: 22:40
- * To change this template use File | Settings | File Templates.
- */
 public class BndJarResourceStore implements ResourceStore {
 
     private Analyzer analyzer;
diff --git a/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndReporter.java b/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndReporter.java
index 9e56151..127a420 100644
--- a/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndReporter.java
+++ b/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndReporter.java
@@ -28,7 +28,7 @@
 /**
  * A {@code BndReporter} knows how to wrap a Bnd Reporter into an iPOJO Reporter.
  *
- * @author Guillaume Sauthier
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class BndReporter extends EmptyReporter {
 
diff --git a/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/ByteArrayResource.java b/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/ByteArrayResource.java
index 260d4ac..90393e1 100644
--- a/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/ByteArrayResource.java
+++ b/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/ByteArrayResource.java
@@ -23,7 +23,7 @@
 /**
  * A {@code ByteArrayResource} is ...
  *
- * @author Guillaume Sauthier
+ *  @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class ByteArrayResource extends AbstractResource {
 
diff --git a/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/PojoizationPlugin.java b/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/PojoizationPlugin.java
index 15f66f0..01d30a5 100644
--- a/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/PojoizationPlugin.java
+++ b/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/PojoizationPlugin.java
@@ -42,7 +42,7 @@
 /**
  * A {@code BndIpojoPlugin} is ...
  *
- * @author Guillaume Sauthier
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class PojoizationPlugin implements Plugin, AnalyzerPlugin {
 
diff --git a/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/ResourceMetadataProvider.java b/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/ResourceMetadataProvider.java
index 15f4772..41c412e 100644
--- a/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/ResourceMetadataProvider.java
+++ b/ipojo/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/ResourceMetadataProvider.java
@@ -32,7 +32,7 @@
 /**
  * A {@code ResourceMetadataProvider} is ...
  *
- * @author Guillaume Sauthier
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class ResourceMetadataProvider implements MetadataProvider {