diff --git a/metadata.xml b/metadata.xml
index f2ac6a6..dd6fa0d 100644
--- a/metadata.xml
+++ b/metadata.xml
@@ -1,21 +1,21 @@
 <!--
-	Licensed to the Apache Software Foundation (ASF) under one
-	or more contributor license agreements.  See the NOTICE file
-	distributed with this work for additional information
-	regarding copyright ownership.  The ASF licenses this file
-	to you under the Apache License, Version 2.0 (the
-	"License"); you may not use this file except in compliance
-	with the License.  You may obtain a copy of the License at
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
 
-	http://www.apache.org/licenses/LICENSE-2.0
+  http://www.apache.org/licenses/LICENSE-2.0
 
-	Unless required by applicable law or agreed to in writing,
-	software distributed under the License is distributed on an
-	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	KIND, either express or implied.  See the License for the
-	specific language governing permissions and limitations
-	under the License.
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
 -->
 <ipojo>
-	<instance component="org.apache.felix.org.apache.felix.ipojo.webconsole.IPOJOServlet"/>
-</ipojo>
\ No newline at end of file
+  <instance component="org.apache.felix.ipojo.webconsole.IPOJOServlet"/>
+</ipojo>
diff --git a/src/main/java/org/apache/felix/org/apache/felix/ipojo/webconsole/IPOJOServlet.java b/src/main/java/org/apache/felix/ipojo/webconsole/IPOJOServlet.java
similarity index 99%
rename from src/main/java/org/apache/felix/org/apache/felix/ipojo/webconsole/IPOJOServlet.java
rename to src/main/java/org/apache/felix/ipojo/webconsole/IPOJOServlet.java
index 0820899..2f6c2dc 100644
--- a/src/main/java/org/apache/felix/org/apache/felix/ipojo/webconsole/IPOJOServlet.java
+++ b/src/main/java/org/apache/felix/ipojo/webconsole/IPOJOServlet.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.org.apache.felix.ipojo.webconsole;
+package org.apache.felix.ipojo.webconsole;
 
 import java.io.IOException;
 import java.io.PrintWriter;