diff --git a/com.minres.scviewer.e4.product/scviewer.product b/com.minres.scviewer.e4.product/scviewer.product
index a44211f..9846949 100644
--- a/com.minres.scviewer.e4.product/scviewer.product
+++ b/com.minres.scviewer.e4.product/scviewer.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="SCViewer" uid="product" id="com.minres.scviewer.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.7.1.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="SCViewer" uid="product" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.7.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
diff --git a/com.minres.scviewer.e4-slim.product/.gitignore b/com.minres.scviewer.e4.product_slim/.gitignore
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/.gitignore
rename to com.minres.scviewer.e4.product_slim/.gitignore
diff --git a/com.minres.scviewer.e4-slim.product/.project b/com.minres.scviewer.e4.product_slim/.project
similarity index 78%
rename from com.minres.scviewer.e4-slim.product/.project
rename to com.minres.scviewer.e4.product_slim/.project
index 16ad524..3e7dc24 100644
--- a/com.minres.scviewer.e4-slim.product/.project
+++ b/com.minres.scviewer.e4.product_slim/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.minres.scviewer.e4-slim.product</name>
+	<name>com.minres.scviewer.e4.product_slim</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer.icns b/com.minres.scviewer.e4.product_slim/icons/SCViewer.icns
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer.icns
rename to com.minres.scviewer.e4.product_slim/icons/SCViewer.icns
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer.ico b/com.minres.scviewer.e4.product_slim/icons/SCViewer.ico
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer.ico
rename to com.minres.scviewer.e4.product_slim/icons/SCViewer.ico
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer.png b/com.minres.scviewer.e4.product_slim/icons/SCViewer.png
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer.png
rename to com.minres.scviewer.e4.product_slim/icons/SCViewer.png
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_16x16@32.bmp b/com.minres.scviewer.e4.product_slim/icons/SCViewer_16x16@32.bmp
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_16x16@32.bmp
rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_16x16@32.bmp
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_16x16@8.bmp b/com.minres.scviewer.e4.product_slim/icons/SCViewer_16x16@8.bmp
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_16x16@8.bmp
rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_16x16@8.bmp
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_256x256@32.bmp b/com.minres.scviewer.e4.product_slim/icons/SCViewer_256x256@32.bmp
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_256x256@32.bmp
rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_256x256@32.bmp
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_32x32@32.bmp b/com.minres.scviewer.e4.product_slim/icons/SCViewer_32x32@32.bmp
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_32x32@32.bmp
rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_32x32@32.bmp
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_32x32@8.bmp b/com.minres.scviewer.e4.product_slim/icons/SCViewer_32x32@8.bmp
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_32x32@8.bmp
rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_32x32@8.bmp
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_48x48@32.bmp b/com.minres.scviewer.e4.product_slim/icons/SCViewer_48x48@32.bmp
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_48x48@32.bmp
rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_48x48@32.bmp
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_48x48@8.bmp b/com.minres.scviewer.e4.product_slim/icons/SCViewer_48x48@8.bmp
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_48x48@8.bmp
rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_48x48@8.bmp
diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_512x512.xpm b/com.minres.scviewer.e4.product_slim/icons/SCViewer_512x512.xpm
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_512x512.xpm
rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_512x512.xpm
diff --git a/com.minres.scviewer.e4-slim.product/icons/convert2ico.sh b/com.minres.scviewer.e4.product_slim/icons/convert2ico.sh
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/icons/convert2ico.sh
rename to com.minres.scviewer.e4.product_slim/icons/convert2ico.sh
diff --git a/com.minres.scviewer.e4-slim.product/pom.xml b/com.minres.scviewer.e4.product_slim/pom.xml
similarity index 100%
rename from com.minres.scviewer.e4-slim.product/pom.xml
rename to com.minres.scviewer.e4.product_slim/pom.xml
diff --git a/com.minres.scviewer.e4-slim.product/scviewer.product b/com.minres.scviewer.e4.product_slim/scviewer.product
similarity index 97%
rename from com.minres.scviewer.e4-slim.product/scviewer.product
rename to com.minres.scviewer.e4.product_slim/scviewer.product
index 659c4c3..69ce508 100644
--- a/com.minres.scviewer.e4-slim.product/scviewer.product
+++ b/com.minres.scviewer.e4.product_slim/scviewer.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="SCViewer" uid="product_slim" id="com.minres.scviewer.e4.product_slim" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.7.1.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="SCViewer" uid="product_slim" id="com.minres.scviewer.e4.application.product_slim" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.7.1.qualifier" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
diff --git a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
index edabd54..8ee0898 100644
--- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
@@ -28,7 +28,8 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  com.opcoach.e4.preferences,
  org.eclipse.e4.core.di.extensions,
  org.eclipse.e4.ui.css.swt.theme;bundle-version="0.10.0",
- org.eclipse.core.resources;bundle-version="3.13.0"
+ org.eclipse.core.resources;bundle-version="3.13.0",
+ javax.annotation;bundle-version="1.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.minres.scviewer.database,
  javax.inject;version="1.0.0"
diff --git a/pom.xml b/pom.xml
index 2f31a58..c95fb60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 		<module>features/com.minres.scviewer.e4.feature</module>
 		<module>p2repositories//com.minres.scviewer.updateSite</module>
 		<module>com.minres.scviewer.e4.product</module>
-		<module>com.minres.scviewer.e4-slim.product</module>
+		<module>com.minres.scviewer.e4.product_slim</module>
 	</modules>
 
 	<properties>