diff --git a/.gitignore b/.gitignore
index 5e56e04..3f6a8c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-/bin
+.metadata/
+bin/
+RemoteSystemsTempFiles/
diff --git a/feature/.project b/feature/.project
new file mode 100644
index 0000000..7b4901b
--- /dev/null
+++ b/feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/feature/build.properties b/feature/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/feature/feature.xml b/feature/feature.xml
new file mode 100644
index 0000000..0734481
--- /dev/null
+++ b/feature/feature.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="pl.gildur.simplepropertieseditor.feature"
+      label="SimplePropertiesEditor"
+      version="1.0.5"
+      provider-name="Piotr Wolny">
+
+   <description url="https://github.com/gildur/SimplePropertiesEditor">
+      Eclipse plug-in for editing Java properties files, automatically
+converts non-ASCII characters to unicode escape sequences.
+   </description>
+
+   <copyright>
+      Copyright (c) 2010 Piotr Wolny
+   </copyright>
+
+   <license url="">
+      Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the &quot;Software&quot;), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+   </license>
+
+   <url>
+      <update label="SimplePropertiesEditor" url="http://gildur.github.io/SimplePropertiesEditor/updates"/>
+   </url>
+
+   <plugin
+         id="pl.gildur.simplepropertieseditor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/.classpath b/plugin/.classpath
similarity index 100%
rename from .classpath
rename to plugin/.classpath
diff --git a/.project b/plugin/.project
similarity index 100%
rename from .project
rename to plugin/.project
diff --git a/.settings/org.eclipse.jdt.core.prefs b/plugin/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from .settings/org.eclipse.jdt.core.prefs
rename to plugin/.settings/org.eclipse.jdt.core.prefs
diff --git a/META-INF/MANIFEST.MF b/plugin/META-INF/MANIFEST.MF
similarity index 66%
rename from META-INF/MANIFEST.MF
rename to plugin/META-INF/MANIFEST.MF
index 4207914..0446c7f 100755
--- a/META-INF/MANIFEST.MF
+++ b/plugin/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SimplePropertiesEditor
-Bundle-SymbolicName: SimplePropertiesEditor; singleton:=true
-Bundle-Version: 1.0.4
-Bundle-Activator: org.gildur.simplepropertieseditor.Activator
+Bundle-SymbolicName: pl.gildur.simplepropertieseditor;singleton:=true
+Bundle-Version: 1.0.5
+Bundle-Activator: pl.gildur.simplepropertieseditor.Activator
 Bundle-Vendor: Piotr Wolny
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface.text,
diff --git a/build.properties b/plugin/build.properties
similarity index 100%
rename from build.properties
rename to plugin/build.properties
diff --git a/icons/icon.gif b/plugin/icons/icon.gif
similarity index 100%
rename from icons/icon.gif
rename to plugin/icons/icon.gif
diff --git a/plugin.xml b/plugin/plugin.xml
similarity index 100%
rename from plugin.xml
rename to plugin/plugin.xml
diff --git a/src/org/gildur/simplepropertieseditor/Activator.java b/plugin/src/pl/gildur/simplepropertieseditor/Activator.java
similarity index 95%
rename from src/org/gildur/simplepropertieseditor/Activator.java
rename to plugin/src/pl/gildur/simplepropertieseditor/Activator.java
index 779511a..60c0942 100755
--- a/src/org/gildur/simplepropertieseditor/Activator.java
+++ b/plugin/src/pl/gildur/simplepropertieseditor/Activator.java
@@ -20,7 +20,7 @@
 // WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
-package org.gildur.simplepropertieseditor;
+package pl.gildur.simplepropertieseditor;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
diff --git a/src/org/gildur/simplepropertieseditor/editor/ColorManager.java b/plugin/src/pl/gildur/simplepropertieseditor/editor/ColorManager.java
similarity index 97%
rename from src/org/gildur/simplepropertieseditor/editor/ColorManager.java
rename to plugin/src/pl/gildur/simplepropertieseditor/editor/ColorManager.java
index 2d13622..efac1d8 100755
--- a/src/org/gildur/simplepropertieseditor/editor/ColorManager.java
+++ b/plugin/src/pl/gildur/simplepropertieseditor/editor/ColorManager.java
@@ -20,7 +20,7 @@
 // WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
-package org.gildur.simplepropertieseditor.editor;
+package pl.gildur.simplepropertieseditor.editor;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/org/gildur/simplepropertieseditor/editor/PropertiesColorConstants.java b/plugin/src/pl/gildur/simplepropertieseditor/editor/PropertiesColorConstants.java
similarity index 96%
rename from src/org/gildur/simplepropertieseditor/editor/PropertiesColorConstants.java
rename to plugin/src/pl/gildur/simplepropertieseditor/editor/PropertiesColorConstants.java
index 6c7f7f2..2903718 100755
--- a/src/org/gildur/simplepropertieseditor/editor/PropertiesColorConstants.java
+++ b/plugin/src/pl/gildur/simplepropertieseditor/editor/PropertiesColorConstants.java
@@ -20,7 +20,7 @@
 // WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
-package org.gildur.simplepropertieseditor.editor;
+package pl.gildur.simplepropertieseditor.editor;
 
 import org.eclipse.swt.graphics.RGB;
 
diff --git a/src/org/gildur/simplepropertieseditor/editor/PropertiesConfiguration.java b/plugin/src/pl/gildur/simplepropertieseditor/editor/PropertiesConfiguration.java
similarity index 98%
rename from src/org/gildur/simplepropertieseditor/editor/PropertiesConfiguration.java
rename to plugin/src/pl/gildur/simplepropertieseditor/editor/PropertiesConfiguration.java
index 8baefa3..63e7c49 100755
--- a/src/org/gildur/simplepropertieseditor/editor/PropertiesConfiguration.java
+++ b/plugin/src/pl/gildur/simplepropertieseditor/editor/PropertiesConfiguration.java
@@ -20,7 +20,7 @@
 // WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
-package org.gildur.simplepropertieseditor.editor;
+package pl.gildur.simplepropertieseditor.editor;
 
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.TextAttribute;
diff --git a/src/org/gildur/simplepropertieseditor/editor/PropertiesDocumentProvider.java b/plugin/src/pl/gildur/simplepropertieseditor/editor/PropertiesDocumentProvider.java
similarity index 98%
rename from src/org/gildur/simplepropertieseditor/editor/PropertiesDocumentProvider.java
rename to plugin/src/pl/gildur/simplepropertieseditor/editor/PropertiesDocumentProvider.java
index 582326b..a8a59ea 100755
--- a/src/org/gildur/simplepropertieseditor/editor/PropertiesDocumentProvider.java
+++ b/plugin/src/pl/gildur/simplepropertieseditor/editor/PropertiesDocumentProvider.java
@@ -20,7 +20,7 @@
 // WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
-package org.gildur.simplepropertieseditor.editor;
+package pl.gildur.simplepropertieseditor.editor;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/src/org/gildur/simplepropertieseditor/editor/PropertiesDocumentWrapper.java b/plugin/src/pl/gildur/simplepropertieseditor/editor/PropertiesDocumentWrapper.java
similarity index 96%
rename from src/org/gildur/simplepropertieseditor/editor/PropertiesDocumentWrapper.java
rename to plugin/src/pl/gildur/simplepropertieseditor/editor/PropertiesDocumentWrapper.java
index 54cf460..1127620 100755
--- a/src/org/gildur/simplepropertieseditor/editor/PropertiesDocumentWrapper.java
+++ b/plugin/src/pl/gildur/simplepropertieseditor/editor/PropertiesDocumentWrapper.java
@@ -20,7 +20,7 @@
 // WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
-package org.gildur.simplepropertieseditor.editor;
+package pl.gildur.simplepropertieseditor.editor;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
diff --git a/src/org/gildur/simplepropertieseditor/editor/PropertiesPartitionScanner.java b/plugin/src/pl/gildur/simplepropertieseditor/editor/PropertiesPartitionScanner.java
similarity index 97%
rename from src/org/gildur/simplepropertieseditor/editor/PropertiesPartitionScanner.java
rename to plugin/src/pl/gildur/simplepropertieseditor/editor/PropertiesPartitionScanner.java
index a5e255e..0f08c01 100755
--- a/src/org/gildur/simplepropertieseditor/editor/PropertiesPartitionScanner.java
+++ b/plugin/src/pl/gildur/simplepropertieseditor/editor/PropertiesPartitionScanner.java
@@ -20,7 +20,7 @@
 // WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
-package org.gildur.simplepropertieseditor.editor;
+package pl.gildur.simplepropertieseditor.editor;
 
 import org.eclipse.jface.text.rules.*;
 
diff --git a/src/org/gildur/simplepropertieseditor/editor/SimplePropertiesEditor.java b/plugin/src/pl/gildur/simplepropertieseditor/editor/SimplePropertiesEditor.java
similarity index 97%
rename from src/org/gildur/simplepropertieseditor/editor/SimplePropertiesEditor.java
rename to plugin/src/pl/gildur/simplepropertieseditor/editor/SimplePropertiesEditor.java
index 0a19046..e9e5e71 100755
--- a/src/org/gildur/simplepropertieseditor/editor/SimplePropertiesEditor.java
+++ b/plugin/src/pl/gildur/simplepropertieseditor/editor/SimplePropertiesEditor.java
@@ -20,7 +20,7 @@
 // WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
-package org.gildur.simplepropertieseditor.editor;
+package pl.gildur.simplepropertieseditor.editor;
 
 import org.eclipse.ui.editors.text.TextEditor;
 
diff --git a/site/.gitignore b/site/.gitignore
new file mode 100644
index 0000000..e58baf4
--- /dev/null
+++ b/site/.gitignore
@@ -0,0 +1,4 @@
+artifacts.jar
+content.jar
+features/
+plugins/
diff --git a/site/.project b/site/.project
new file mode 100644
index 0000000..4386b92
--- /dev/null
+++ b/site/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>site</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.UpdateSiteBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.UpdateSiteNature</nature>
+	</natures>
+</projectDescription>
diff --git a/site/site.xml b/site/site.xml
new file mode 100644
index 0000000..bedb186
--- /dev/null
+++ b/site/site.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <description name="SimplePropertiesEditor" url="http://gildur.github.io/SimplePropertiesEditor/updates">
+      Eclipse plug-in for editing Java properties files, automatically converts non-ASCII characters to unicode escape sequences.
+   </description>
+   <feature url="features/pl.gildur.simplepropertieseditor.feature_1.0.5.jar" id="pl.gildur.simplepropertieseditor.feature" version="1.0.5"/>
+</site>