diff --git a/.gitignore b/.gitignore
index c4a2686..33bbbd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ SCViewer.xcf
SCViewer_1.png
*.launch
copyrightLog.txt
+/workspace
diff --git a/pom.xml b/pom.xml
index 2f31a58..1f699f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,8 +22,8 @@
features/com.minres.scviewer.e4.platform.feature
features/com.minres.scviewer.e4.feature
p2repositories//com.minres.scviewer.updateSite
- com.minres.scviewer.e4.product
- com.minres.scviewer.e4-slim.product
+ products/com.minres.scviewer.e4.product
+ products/com.minres.scviewer.e4.product_slim
diff --git a/com.minres.scviewer.e4-slim.product/.gitignore b/products/com.minres.scviewer.e4.product/.gitignore
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/.gitignore
rename to products/com.minres.scviewer.e4.product/.gitignore
diff --git a/com.minres.scviewer.e4.product/.project b/products/com.minres.scviewer.e4.product/.project
similarity index 100%
rename from com.minres.scviewer.e4.product/.project
rename to products/com.minres.scviewer.e4.product/.project
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer.icns b/products/com.minres.scviewer.e4.product/icons/SCViewer.icns
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer.icns
rename to products/com.minres.scviewer.e4.product/icons/SCViewer.icns
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer.ico b/products/com.minres.scviewer.e4.product/icons/SCViewer.ico
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer.ico
rename to products/com.minres.scviewer.e4.product/icons/SCViewer.ico
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer.png b/products/com.minres.scviewer.e4.product/icons/SCViewer.png
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer.png
rename to products/com.minres.scviewer.e4.product/icons/SCViewer.png
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_16x16@32.bmp b/products/com.minres.scviewer.e4.product/icons/SCViewer_16x16@32.bmp
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_16x16@32.bmp
rename to products/com.minres.scviewer.e4.product/icons/SCViewer_16x16@32.bmp
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_16x16@8.bmp b/products/com.minres.scviewer.e4.product/icons/SCViewer_16x16@8.bmp
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_16x16@8.bmp
rename to products/com.minres.scviewer.e4.product/icons/SCViewer_16x16@8.bmp
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_256x256@32.bmp b/products/com.minres.scviewer.e4.product/icons/SCViewer_256x256@32.bmp
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_256x256@32.bmp
rename to products/com.minres.scviewer.e4.product/icons/SCViewer_256x256@32.bmp
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_32x32@32.bmp b/products/com.minres.scviewer.e4.product/icons/SCViewer_32x32@32.bmp
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_32x32@32.bmp
rename to products/com.minres.scviewer.e4.product/icons/SCViewer_32x32@32.bmp
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_32x32@8.bmp b/products/com.minres.scviewer.e4.product/icons/SCViewer_32x32@8.bmp
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_32x32@8.bmp
rename to products/com.minres.scviewer.e4.product/icons/SCViewer_32x32@8.bmp
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_48x48@32.bmp b/products/com.minres.scviewer.e4.product/icons/SCViewer_48x48@32.bmp
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_48x48@32.bmp
rename to products/com.minres.scviewer.e4.product/icons/SCViewer_48x48@32.bmp
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_48x48@8.bmp b/products/com.minres.scviewer.e4.product/icons/SCViewer_48x48@8.bmp
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_48x48@8.bmp
rename to products/com.minres.scviewer.e4.product/icons/SCViewer_48x48@8.bmp
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_512x512.xpm b/products/com.minres.scviewer.e4.product/icons/SCViewer_512x512.xpm
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_512x512.xpm
rename to products/com.minres.scviewer.e4.product/icons/SCViewer_512x512.xpm
diff --git a/com.minres.scviewer.e4-slim.product/icons/convert2ico.sh b/products/com.minres.scviewer.e4.product/icons/convert2ico.sh
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/convert2ico.sh
rename to products/com.minres.scviewer.e4.product/icons/convert2ico.sh
diff --git a/com.minres.scviewer.e4.product/pom.xml b/products/com.minres.scviewer.e4.product/pom.xml
similarity index 97%
rename from com.minres.scviewer.e4.product/pom.xml
rename to products/com.minres.scviewer.e4.product/pom.xml
index cc22a71..f7b01e4 100644
--- a/com.minres.scviewer.e4.product/pom.xml
+++ b/products/com.minres.scviewer.e4.product/pom.xml
@@ -7,7 +7,7 @@
com.minres.scviewer
com.minres.scviewer.parent
2.0.0-SNAPSHOT
- ..
+ ../..
com.minres.scviewer.e4.product
2.7.1-SNAPSHOT
diff --git a/com.minres.scviewer.e4.product/scviewer.product b/products/com.minres.scviewer.e4.product/scviewer.product
similarity index 94%
rename from com.minres.scviewer.e4.product/scviewer.product
rename to products/com.minres.scviewer.e4.product/scviewer.product
index a44211f..9846949 100644
--- a/com.minres.scviewer.e4.product/scviewer.product
+++ b/products/com.minres.scviewer.e4.product/scviewer.product
@@ -1,7 +1,7 @@
-
+
diff --git a/com.minres.scviewer.e4.product/.gitignore b/products/com.minres.scviewer.e4.product_slim/.gitignore
similarity index 100%
rename from com.minres.scviewer.e4.product/.gitignore
rename to products/com.minres.scviewer.e4.product_slim/.gitignore
diff --git a/com.minres.scviewer.e4-slim.product/.project b/products/com.minres.scviewer.e4.product_slim/.project
similarity index 78%
rename from com.minres.scviewer.e4-slim.product/.project
rename to products/com.minres.scviewer.e4.product_slim/.project
index 16ad524..3e7dc24 100644
--- a/com.minres.scviewer.e4-slim.product/.project
+++ b/products/com.minres.scviewer.e4.product_slim/.project
@@ -1,6 +1,6 @@
- com.minres.scviewer.e4-slim.product
+ com.minres.scviewer.e4.product_slim
diff --git a/com.minres.scviewer.e4.product/icons/SCViewer.icns b/products/com.minres.scviewer.e4.product_slim/icons/SCViewer.icns
similarity index 100%
rename from com.minres.scviewer.e4.product/icons/SCViewer.icns
rename to products/com.minres.scviewer.e4.product_slim/icons/SCViewer.icns
diff --git a/com.minres.scviewer.e4.product/icons/SCViewer.ico b/products/com.minres.scviewer.e4.product_slim/icons/SCViewer.ico
similarity index 100%
rename from com.minres.scviewer.e4.product/icons/SCViewer.ico
rename to products/com.minres.scviewer.e4.product_slim/icons/SCViewer.ico
diff --git a/com.minres.scviewer.e4.product/icons/SCViewer.png b/products/com.minres.scviewer.e4.product_slim/icons/SCViewer.png
similarity index 100%
rename from com.minres.scviewer.e4.product/icons/SCViewer.png
rename to products/com.minres.scviewer.e4.product_slim/icons/SCViewer.png
diff --git a/com.minres.scviewer.e4.product/icons/SCViewer_16x16@32.bmp b/products/com.minres.scviewer.e4.product_slim/icons/SCViewer_16x16@32.bmp
similarity index 100%
rename from com.minres.scviewer.e4.product/icons/SCViewer_16x16@32.bmp
rename to products/com.minres.scviewer.e4.product_slim/icons/SCViewer_16x16@32.bmp
diff --git a/com.minres.scviewer.e4.product/icons/SCViewer_16x16@8.bmp b/products/com.minres.scviewer.e4.product_slim/icons/SCViewer_16x16@8.bmp
similarity index 100%
rename from com.minres.scviewer.e4.product/icons/SCViewer_16x16@8.bmp
rename to products/com.minres.scviewer.e4.product_slim/icons/SCViewer_16x16@8.bmp
diff --git a/com.minres.scviewer.e4.product/icons/SCViewer_256x256@32.bmp b/products/com.minres.scviewer.e4.product_slim/icons/SCViewer_256x256@32.bmp
similarity index 100%
rename from com.minres.scviewer.e4.product/icons/SCViewer_256x256@32.bmp
rename to products/com.minres.scviewer.e4.product_slim/icons/SCViewer_256x256@32.bmp
diff --git a/com.minres.scviewer.e4.product/icons/SCViewer_32x32@32.bmp b/products/com.minres.scviewer.e4.product_slim/icons/SCViewer_32x32@32.bmp
similarity index 100%
rename from com.minres.scviewer.e4.product/icons/SCViewer_32x32@32.bmp
rename to products/com.minres.scviewer.e4.product_slim/icons/SCViewer_32x32@32.bmp
diff --git a/com.minres.scviewer.e4.product/icons/SCViewer_32x32@8.bmp b/products/com.minres.scviewer.e4.product_slim/icons/SCViewer_32x32@8.bmp
similarity index 100%
rename from com.minres.scviewer.e4.product/icons/SCViewer_32x32@8.bmp
rename to products/com.minres.scviewer.e4.product_slim/icons/SCViewer_32x32@8.bmp
diff --git a/com.minres.scviewer.e4.product/icons/SCViewer_48x48@32.bmp b/products/com.minres.scviewer.e4.product_slim/icons/SCViewer_48x48@32.bmp
similarity index 100%
rename from com.minres.scviewer.e4.product/icons/SCViewer_48x48@32.bmp
rename to products/com.minres.scviewer.e4.product_slim/icons/SCViewer_48x48@32.bmp
diff --git a/com.minres.scviewer.e4.product/icons/SCViewer_48x48@8.bmp b/products/com.minres.scviewer.e4.product_slim/icons/SCViewer_48x48@8.bmp
similarity index 100%
rename from com.minres.scviewer.e4.product/icons/SCViewer_48x48@8.bmp
rename to products/com.minres.scviewer.e4.product_slim/icons/SCViewer_48x48@8.bmp
diff --git a/com.minres.scviewer.e4.product/icons/SCViewer_512x512.xpm b/products/com.minres.scviewer.e4.product_slim/icons/SCViewer_512x512.xpm
similarity index 100%
rename from com.minres.scviewer.e4.product/icons/SCViewer_512x512.xpm
rename to products/com.minres.scviewer.e4.product_slim/icons/SCViewer_512x512.xpm
diff --git a/com.minres.scviewer.e4.product/icons/convert2ico.sh b/products/com.minres.scviewer.e4.product_slim/icons/convert2ico.sh
similarity index 100%
rename from com.minres.scviewer.e4.product/icons/convert2ico.sh
rename to products/com.minres.scviewer.e4.product_slim/icons/convert2ico.sh
diff --git a/com.minres.scviewer.e4-slim.product/pom.xml b/products/com.minres.scviewer.e4.product_slim/pom.xml
similarity index 97%
rename from com.minres.scviewer.e4-slim.product/pom.xml
rename to products/com.minres.scviewer.e4.product_slim/pom.xml
index 1a1da14..a093805 100644
--- a/com.minres.scviewer.e4-slim.product/pom.xml
+++ b/products/com.minres.scviewer.e4.product_slim/pom.xml
@@ -7,7 +7,7 @@
com.minres.scviewer
com.minres.scviewer.parent
2.0.0-SNAPSHOT
- ..
+ ../..
com.minres.scviewer.e4.product_slim
2.7.1-SNAPSHOT
diff --git a/com.minres.scviewer.e4-slim.product/scviewer.product b/products/com.minres.scviewer.e4.product_slim/scviewer.product
similarity index 97%
rename from com.minres.scviewer.e4-slim.product/scviewer.product
rename to products/com.minres.scviewer.e4.product_slim/scviewer.product
index 659c4c3..69ce508 100644
--- a/com.minres.scviewer.e4-slim.product/scviewer.product
+++ b/products/com.minres.scviewer.e4.product_slim/scviewer.product
@@ -1,7 +1,7 @@
-
+