diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e585457
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.DS_Store
+.svn
+.idea
+log/*.log
+tmp/**
+node_modules/
\ No newline at end of file
diff --git a/index.html b/plg_uikit_htmleditor/index.html
similarity index 100%
rename from index.html
rename to plg_uikit_htmleditor/index.html
diff --git a/language/en-GB/en-GB.plg_editors_uikit_htmleditor.ini b/plg_uikit_htmleditor/language/en-GB/en-GB.plg_editors_uikit_htmleditor.ini
similarity index 100%
rename from language/en-GB/en-GB.plg_editors_uikit_htmleditor.ini
rename to plg_uikit_htmleditor/language/en-GB/en-GB.plg_editors_uikit_htmleditor.ini
diff --git a/language/en-GB/en-GB.plg_editors_uikit_htmleditor.sys.ini b/plg_uikit_htmleditor/language/en-GB/en-GB.plg_editors_uikit_htmleditor.sys.ini
similarity index 100%
rename from language/en-GB/en-GB.plg_editors_uikit_htmleditor.sys.ini
rename to plg_uikit_htmleditor/language/en-GB/en-GB.plg_editors_uikit_htmleditor.sys.ini
diff --git a/layouts/editors/uikit_htmleditor/element.php b/plg_uikit_htmleditor/layouts/editors/uikit_htmleditor/element.php
similarity index 100%
rename from layouts/editors/uikit_htmleditor/element.php
rename to plg_uikit_htmleditor/layouts/editors/uikit_htmleditor/element.php
diff --git a/layouts/editors/uikit_htmleditor/init.php b/plg_uikit_htmleditor/layouts/editors/uikit_htmleditor/init.php
similarity index 100%
rename from layouts/editors/uikit_htmleditor/init.php
rename to plg_uikit_htmleditor/layouts/editors/uikit_htmleditor/init.php
diff --git a/media/css/htmleditor.min.css b/plg_uikit_htmleditor/media/css/htmleditor.min.css
similarity index 100%
rename from media/css/htmleditor.min.css
rename to plg_uikit_htmleditor/media/css/htmleditor.min.css
diff --git a/media/css/simple_editor.css b/plg_uikit_htmleditor/media/css/simple_editor.css
similarity index 100%
rename from media/css/simple_editor.css
rename to plg_uikit_htmleditor/media/css/simple_editor.css
diff --git a/media/css/uikit.min.css b/plg_uikit_htmleditor/media/css/uikit.min.css
similarity index 100%
rename from media/css/uikit.min.css
rename to plg_uikit_htmleditor/media/css/uikit.min.css
diff --git a/media/fonts/FontAwesome.otf b/plg_uikit_htmleditor/media/fonts/FontAwesome.otf
similarity index 100%
rename from media/fonts/FontAwesome.otf
rename to plg_uikit_htmleditor/media/fonts/FontAwesome.otf
diff --git a/media/fonts/fontawesome-webfont.ttf b/plg_uikit_htmleditor/media/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from media/fonts/fontawesome-webfont.ttf
rename to plg_uikit_htmleditor/media/fonts/fontawesome-webfont.ttf
diff --git a/media/fonts/fontawesome-webfont.woff b/plg_uikit_htmleditor/media/fonts/fontawesome-webfont.woff
similarity index 100%
rename from media/fonts/fontawesome-webfont.woff
rename to plg_uikit_htmleditor/media/fonts/fontawesome-webfont.woff
diff --git a/media/fonts/fontawesome-webfont.woff2 b/plg_uikit_htmleditor/media/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from media/fonts/fontawesome-webfont.woff2
rename to plg_uikit_htmleditor/media/fonts/fontawesome-webfont.woff2
diff --git a/media/js/htmleditor.min.js b/plg_uikit_htmleditor/media/js/htmleditor.min.js
similarity index 100%
rename from media/js/htmleditor.min.js
rename to plg_uikit_htmleditor/media/js/htmleditor.min.js
diff --git a/media/js/marked.min.js b/plg_uikit_htmleditor/media/js/marked.min.js
similarity index 100%
rename from media/js/marked.min.js
rename to plg_uikit_htmleditor/media/js/marked.min.js
diff --git a/media/js/uikit.min.js b/plg_uikit_htmleditor/media/js/uikit.min.js
similarity index 100%
rename from media/js/uikit.min.js
rename to plg_uikit_htmleditor/media/js/uikit.min.js
diff --git a/uikit_htmleditor.php b/plg_uikit_htmleditor/uikit_htmleditor.php
similarity index 100%
rename from uikit_htmleditor.php
rename to plg_uikit_htmleditor/uikit_htmleditor.php
diff --git a/uikit_htmleditor.xml b/plg_uikit_htmleditor/uikit_htmleditor.xml
similarity index 100%
rename from uikit_htmleditor.xml
rename to plg_uikit_htmleditor/uikit_htmleditor.xml