diff --git a/assembly-multiuser/assembly-ide-war/pom.xml b/assembly-multiuser/assembly-ide-war/pom.xml
index ad9d374f4d..40bc6fe129 100644
--- a/assembly-multiuser/assembly-ide-war/pom.xml
+++ b/assembly-multiuser/assembly-ide-war/pom.xml
@@ -23,18 +23,20 @@
     <name>Che IDE Assembly Multiuser :: Compiling GWT Application</name>
     <properties>
         <generated.sources.directory>${project.build.directory}/generated-sources/gen</generated.sources.directory>
+        <gwt.log.enable>false</gwt.log.enable>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.eclipse.che</groupId>
             <artifactId>assembly-ide-war</artifactId>
-            <classifier>classes</classifier>
+            <type>war</type>
         </dependency>
+        <!-- brings transitive dependencies for GWT compiler and source generators -->
         <dependency>
             <groupId>org.eclipse.che</groupId>
-            <artifactId>assembly-ide-war</artifactId>
-            <type>war</type>
+            <artifactId>che-ide-gwt-app</artifactId>
+            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.multiuser</groupId>
@@ -152,6 +154,7 @@
             <plugin>
                 <groupId>net.ltgt.gwt.maven</groupId>
                 <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
                 <executions>
                     <execution>
                         <goals>
@@ -204,6 +207,7 @@
                                 <include>WEB-INF/rewrite.config</include>
                                 <include>WEB-INF/web.xml</include>
                                 <include>WEB-INF/classes/org/eclipse/che/*.class</include>
+                                <include>WEB-INF/lib/</include>
                             </includes>
                         </overlay>
                         <overlay />
diff --git a/assembly/assembly-ide-war/pom.xml b/assembly/assembly-ide-war/pom.xml
index dd48f55a67..360bbb22de 100644
--- a/assembly/assembly-ide-war/pom.xml
+++ b/assembly/assembly-ide-war/pom.xml
@@ -20,211 +20,33 @@
     </parent>
     <artifactId>assembly-ide-war</artifactId>
     <packaging>war</packaging>
-    <name>Che IDE :: Compiling GWT Application</name>
+    <name>Che IDE :: War Packaging</name>
+    <description>Packages Che IDE GWT application as a Java web app</description>
     <properties>
-        <generated.sources.directory>${project.build.directory}/generated-sources/gen</generated.sources.directory>
-        <gwt.log.enable>true</gwt.log.enable>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
+        <!-- overlay the IDE GWT app’s content in the resulting WAR -->
         <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-ide-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.infrastructure.docker</groupId>
-            <artifactId>docker-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-activity-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-composer-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-cpp-lang-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-csharp-lang-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-debugger-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-ext-dashboard-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-gdb-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-git-ext-git</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-github-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-github-oauth2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-github-pullrequest</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-github-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-gwt-ext-gwt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-help-ext-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-debugger-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-ext-lang-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-ext-lang-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-plain-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-plain-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-keybinding-eclipse-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-languageserver-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-machine-ssh-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-maven-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-maven-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-nodejs-debugger-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-nodejs-lang-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-nodejs-lang-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-orion-compare</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-php-lang-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-php-lang-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-product-info</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-pullrequest-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-pullrequest-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-python-lang-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-python-lang-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-sdk-ext-plugins</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-ssh-key-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-testing-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-testing-junit-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-testing-phpunit-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-testing-testng-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-web-ext-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-yaml-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-yaml-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-zend-debugger-ide</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.gwt</groupId>
-            <artifactId>gwt-dev</artifactId>
-            <scope>provided</scope>
+            <groupId>org.eclipse.che</groupId>
+            <artifactId>che-ide-gwt-app</artifactId>
+            <type>war</type>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-commons-j2ee</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -247,11 +69,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -260,187 +77,14 @@
                     <execution>
                         <id>analyze</id>
                         <configuration>
-                            <skip>true</skip>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- dependency is required just to overlay it's content -->
+                                <dep>org.eclipse.che:che-ide-gwt-app</dep>
+                            </ignoredUnusedDeclaredDependencies>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-            <!-- Source Generator invocation -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>gwt-xml</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                        <configuration>
-                            <mainClass>org.eclipse.che.util.GwtXmlGenerator</mainClass>
-                            <arguments>
-                                <argument>--rootDir=${generated.sources.directory}</argument>
-                                <argument>--loggingEnabled=${gwt.log.enable}</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>extManager-client</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                        <configuration>
-                            <mainClass>org.eclipse.che.util.ExtensionManagerGenerator</mainClass>
-                            <arguments>
-                                <argument>--rootDir=${generated.sources.directory}</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>IDEInjector-client</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                        <configuration>
-                            <mainClass>org.eclipse.che.util.IDEInjectorGenerator</mainClass>
-                            <arguments>
-                                <argument>--rootDir=${generated.sources.directory}</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>DtoRegistry-client</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                        <configuration>
-                            <mainClass>org.eclipse.che.util.DtoFactoryVisitorRegistryGenerator</mainClass>
-                            <arguments>
-                                <argument>--rootDir=${generated.sources.directory}</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.che.core</groupId>
-                <artifactId>che-core-dyna-provider-generator-maven-plugin</artifactId>
-                <version>${project.version}</version>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <outputDirectory>${generated.sources.directory}</outputDirectory>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>net.ltgt.gwt.maven</groupId>
-                <artifactId>gwt-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <moduleName>org.eclipse.che.ide.IDE</moduleName>
-                    <jvmArgs>
-                        <arg>${gwt.compiler.jvmArgs.Xss}</arg>
-                        <arg>${gwt.compiler.jvmArgs.Xmx}</arg>
-                    </jvmArgs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>buildnumber</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo append="false" file="${project.build.directory}/classes/org/eclipse/che/ide/ext/help/client/BuildInfo.properties">revision = ${revision}
-                                    buildTime = ${timestamp}
-                                    version = ${project.version}</echo>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <packagingExcludes>%regex[WEB-INF\\lib\\(?!.*j2ee).*.jar]</packagingExcludes>
-                    <attachClasses>true</attachClasses>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${generated.sources.directory}</source>
-                                <source>src/main/java</source>
-                                <source>src/main/webapp</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/webapp</directory>
-                                    <targetPath />
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>buildnumber-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>create</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <timestampFormat>{0, date, yyyy-MM-dd HH:mm:ss}</timestampFormat>
-                    <buildNumberPropertyName>revision</buildNumberPropertyName>
-                    <doCheck>false</doCheck>
-                    <doUpdate>false</doUpdate>
-                    <shortRevisionLength>16</shortRevisionLength>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/core/che-core-api-core/pom.xml b/core/che-core-api-core/pom.xml
index 5b09cfe961..5c851edbca 100644
--- a/core/che-core-api-core/pom.xml
+++ b/core/che-core-api-core/pom.xml
@@ -169,17 +169,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${generated.sources.directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.eclipse.che.core</groupId>
diff --git a/core/che-core-api-model/pom.xml b/core/che-core-api-model/pom.xml
index 8681085f8d..d2e2100b34 100644
--- a/core/che-core-api-model/pom.xml
+++ b/core/che-core-api-model/pom.xml
@@ -27,17 +27,4 @@
             <artifactId>che-core-commons-annotations</artifactId>
         </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${generated.sources.directory}</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/ide/che-core-ide-api/pom.xml b/ide/che-core-ide-api/pom.xml
index 35098a996c..eaa47e809f 100644
--- a/ide/che-core-ide-api/pom.xml
+++ b/ide/che-core-ide-api/pom.xml
@@ -20,7 +20,7 @@
     </parent>
     <groupId>org.eclipse.che.core</groupId>
     <artifactId>che-core-ide-api</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Core :: IDE :: API</name>
     <properties>
         <dto-generator-out-directory>${project.build.directory}/generated-sources/gen</dto-generator-out-directory>
@@ -55,14 +55,29 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-auth-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-auth-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-core</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-debug-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-debug-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-dto</artifactId>
@@ -71,34 +86,74 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-factory-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-factory-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-git-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-git-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-model</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-model</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-project-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-project-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-project-templates-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-project-templates-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-ssh-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-ssh-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-user-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-user-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-workspace-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-workspace-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-annotations</artifactId>
@@ -154,13 +209,7 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
         <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
             <resource>
                 <directory>src/main/resources</directory>
             </resource>
@@ -169,6 +218,14 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.ide.Api</moduleName>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -243,11 +300,7 @@
                 <artifactId>license-maven-plugin</artifactId>
                 <configuration>
                     <excludes>
-                        <exclude>**/*.png</exclude>
-                        <exclude>**/*.gif</exclude>
-                        <exclude>**/*.jpg</exclude>
                         <exclude>**/ide/api/editor/text/TypedPosition.java</exclude>
-                        <exclude>**/ide/api/text/annotation/AnnotationModelEvent.java</exclude>
                         <exclude>**/ide/api/editor/text/rules/**/*.*</exclude>
                         <exclude>**/org/eclipse/che/ide/api/editor/reconciler/DirtyRegion.java</exclude>
                         <exclude>**/org/eclipse/che/ide/api/editor/reconciler/DirtyRegionQueue.java</exclude>
@@ -255,6 +308,33 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.core:che-core-api-auth-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-factory-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-core</dep>
+                                <dep>org.eclipse.che.core:che-core-api-model</dep>
+                                <dep>org.eclipse.che.core:che-core-api-git-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-workspace-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-project-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-user-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-project-templates-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-debug-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-ssh-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-gwt-logger</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/Api.gwt.xml b/ide/che-core-ide-api/src/main/module.gwt.xml
similarity index 71%
rename from ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/Api.gwt.xml
rename to ide/che-core-ide-api/src/main/module.gwt.xml
index 28e1fa7d12..c6b387ec21 100644
--- a/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/Api.gwt.xml
+++ b/ide/che-core-ide-api/src/main/module.gwt.xml
@@ -16,19 +16,30 @@
     <inherits name="com.google.gwt.user.User"/>
 
     <inherits name="elemental.Elemental"/>
-    <inherits name="org.eclipse.che.ide.Commons"/>
     <inherits name="com.google.gwt.json.JSON"/>
     <inherits name="com.google.gwt.inject.Inject"/>
     <inherits name="com.google.gwt.user.Debug"/>
     <inherits name="org.vectomatic.libgwtsvg"/>
-    <inherits name="org.eclipse.che.api.promises.Promises"/>
+
+    <!-- inherit shared libs' sources -->
+    <inherits name="org.eclipse.che.api.auth.Auth"/>
     <inherits name="org.eclipse.che.api.core.model.Model"/>
     <inherits name="org.eclipse.che.api.core.Core"/>
+    <inherits name="org.eclipse.che.api.debug.Debug"/>
     <inherits name="org.eclipse.che.api.factory.Factory"/>
-    <inherits name="org.eclipse.che.api.workspace.Workspace"/>
-    <inherits name="org.eclipse.che.api.project.Project"/>
     <inherits name="org.eclipse.che.api.git.Git"/>
-
+    <inherits name="org.eclipse.che.api.machine.Machine"/>
+    <inherits name="org.eclipse.che.api.project.Project"/>
+    <inherits name="org.eclipse.che.api.ssh.Ssh"/>
+    <inherits name="org.eclipse.che.api.testing.Testing"/>
     <inherits name="org.eclipse.che.api.user.User"/>
+    <inherits name="org.eclipse.che.api.workspace.Workspace"/>
+
+    <!-- commons-gwt -->
+    <inherits name="org.eclipse.che.ide.Commons"/>
+    <inherits name="org.eclipse.che.ide.Util"/>
+    <inherits name="org.eclipse.che.ide.collections.Collections"/>
+    <inherits name="org.eclipse.che.ide.runtime.Runtime"/>
+
     <source path="api"/>
 </module>
diff --git a/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/core/Core.gwt.xml b/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/core/Core.gwt.xml
index d74698850d..40d1baa21a 100644
--- a/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/core/Core.gwt.xml
+++ b/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/core/Core.gwt.xml
@@ -13,16 +13,8 @@
 -->
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
 <module>
-    <inherits name='com.google.gwt.user.User'/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <source path='rest/shared'/>
-    <source path='jsonrpc/shared'/>
-    <source path='websocket/shared'/>
-    <source path='websocket/commons'/>
-    <source path='jsonrpc/reception'/>
-    <source path='jsonrpc/transmission'/>
-    <source path='jsonrpc/json'/>
     <source path='jsonrpc/commons'/>
-    <source path='logger/commons'/>
     <source path='notification/dto'/>
+    <source path='rest/shared'/>
+    <source path='websocket/commons'/>
 </module>
diff --git a/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/git/Git.gwt.xml b/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/git/Git.gwt.xml
index 81af82890a..40f8e4d4da 100644
--- a/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/git/Git.gwt.xml
+++ b/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/git/Git.gwt.xml
@@ -17,6 +17,5 @@
     <inherits name="com.google.gwt.json.JSON"/>
     <inherits name="org.eclipse.che.ide.Commons"/>
     <inherits name="org.eclipse.che.api.machine.Machine"/>
-    <inherits name="org.eclipse.che.ide.Api"/>
     <source path='shared'/>
 </module>
diff --git a/ide/che-core-ide-app/pom.xml b/ide/che-core-ide-app/pom.xml
index 9cba655b7f..1837e0a31b 100644
--- a/ide/che-core-ide-app/pom.xml
+++ b/ide/che-core-ide-app/pom.xml
@@ -19,10 +19,9 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-ide-app</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Core :: IDE :: App</name>
     <properties>
-        <dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
         <findbugs.failonerror>false</findbugs.failonerror>
         <generated.sources.directory>${project.build.directory}/generated-sources/gen</generated.sources.directory>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -61,22 +60,47 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-core</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-debug-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-debug-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-factory-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-factory-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-git-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-git-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-model</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-model</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-project-shared</artifactId>
@@ -85,18 +109,38 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-project-templates-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-project-templates-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-ssh-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-ssh-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-user-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-user-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-workspace-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-workspace-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-annotations</artifactId>
@@ -116,6 +160,7 @@
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-ide-ui</artifactId>
+            <type>gwt-lib</type>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.lib</groupId>
@@ -183,54 +228,20 @@
         </dependency>
     </dependencies>
     <build>
-        <!-- Generate compiled stuff in the folder used for developing mode -->
-        <outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory>
         <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
             <resource>
                 <filtering>true</filtering>
                 <directory>src/main/resources</directory>
             </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
         </resources>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>analyze</id>
-                        <configuration>
-                            <ignoredDependencies>
-                                <ignoredDependency>org.eclipse.che.core:che-core-ide-generators</ignoredDependency>
-                            </ignoredDependencies>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>unpack-terminal</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.eclipse.che.lib</groupId>
-                                    <artifactId>che-terminal-client</artifactId>
-                                    <version>${che.lib.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.outputDirectory}/org/eclipse/che/public/term</outputDirectory>
-                                    <excludes>org/**,META-INF/**</excludes>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.ide.Core</moduleName>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -294,18 +305,6 @@
                             </sources>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>add-source-dto</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${dto-generator-out-directory}</source>
-                            </sources>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -329,9 +328,6 @@
                 <artifactId>license-maven-plugin</artifactId>
                 <configuration>
                     <excludes>
-                        <exclude>**/*.png</exclude>
-                        <exclude>**/*.gif</exclude>
-                        <exclude>**/*.jpg</exclude>
                         <exclude>**/OutputCustomizer.java</exclude>
                         <exclude>**/AbstractOutputCustomizer.java</exclude>
                         <exclude>**/BaseOutputCustomizerTest.java</exclude>
@@ -346,6 +342,51 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-terminal</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.eclipse.che.lib</groupId>
+                                    <artifactId>che-terminal-client</artifactId>
+                                    <version>${che.lib.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.outputDirectory}/org/eclipse/che/public/term</outputDirectory>
+                                    <excludes>org/**,META-INF/**</excludes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <dep>org.eclipse.che.core:che-core-ide-generators</dep>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.core:che-core-api-factory-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-core</dep>
+                                <dep>org.eclipse.che.core:che-core-api-model</dep>
+                                <dep>org.eclipse.che.core:che-core-api-git-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-ssh-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-workspace-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-user-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-project-templates-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-debug-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/Core.gwt.xml b/ide/che-core-ide-app/src/main/module.gwt.xml
similarity index 79%
rename from ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/Core.gwt.xml
rename to ide/che-core-ide-app/src/main/module.gwt.xml
index 22c4a230b9..c48811490f 100644
--- a/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/Core.gwt.xml
+++ b/ide/che-core-ide-app/src/main/module.gwt.xml
@@ -19,23 +19,19 @@
     </generate-with>
     <stylesheet src="https://fonts.googleapis.com/css?family=Open+Sans"></stylesheet>
 
-    <inherits name="org.eclipse.che.api.core.Core"/>
-    <inherits name="org.eclipse.che.api.machine.Machine"/>
-    <inherits name="org.eclipse.che.api.workspace.Workspace"/>
-    <inherits name="org.eclipse.che.api.git.Git"/>
-    <inherits name="org.eclipse.che.api.factory.Factory"/>
-
     <inherits name="com.google.gwt.user.User"/>
     <inherits name="elemental.Elemental"/>
     <inherits name="org.eclipse.che.ide.Commons"/>
-    <inherits name="org.eclipse.che.ide.Api"/>
     <inherits name="org.eclipse.che.api.core.model.Model"/>
     <inherits name="com.google.gwt.json.JSON"/>
     <inherits name="com.google.gwt.inject.Inject"/>
     <inherits name="com.google.gwt.user.Debug"/>
-    <inherits name="com.google.common.base.Base"/>
     <inherits name="com.google.common.collect.Collect"/>
     <inherits name="org.eclipse.che.providers.Providers"/>
     <inherits name="org.eclipse.che.security.OAuth"/>
+
+    <inherits name="org.eclipse.che.Requirejs"/>
+    <inherits name="org.eclipse.che.lib.terminal.Terminal"/>
+
     <source path=""/>
 </module>
diff --git a/ide/che-core-ide-generators/pom.xml b/ide/che-core-ide-generators/pom.xml
index 522a6190d4..33c9502b71 100644
--- a/ide/che-core-ide-generators/pom.xml
+++ b/ide/che-core-ide-generators/pom.xml
@@ -102,17 +102,6 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ide/che-core-ide-ui/pom.xml b/ide/che-core-ide-ui/pom.xml
index 18658e86be..12a6a91fed 100644
--- a/ide/che-core-ide-ui/pom.xml
+++ b/ide/che-core-ide-ui/pom.xml
@@ -20,6 +20,7 @@
     </parent>
     <groupId>org.eclipse.che.core</groupId>
     <artifactId>che-core-ide-ui</artifactId>
+    <packaging>gwt-lib</packaging>
     <name>Che Core :: IDE :: UI</name>
     <properties>
         <findbugs.failonerror>false</findbugs.failonerror>
@@ -99,23 +100,15 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
         <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.ide.UI</moduleName>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/CodenvyUI.gwt.xml b/ide/che-core-ide-ui/src/main/module.gwt.xml
similarity index 87%
rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/CodenvyUI.gwt.xml
rename to ide/che-core-ide-ui/src/main/module.gwt.xml
index 13fe565cc2..2749d8eb96 100644
--- a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/CodenvyUI.gwt.xml
+++ b/ide/che-core-ide-ui/src/main/module.gwt.xml
@@ -13,6 +13,5 @@
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
 <module>
     <inherits name='com.google.gwt.user.User'/>
-    <inherits name="org.eclipse.che.ide.Api"/>
-    <source path=""/>
-</module>
\ No newline at end of file
+    <source path="ui"/>
+</module>
diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/css/font-awesome.min.css b/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/css/font-awesome.min.css
similarity index 100%
rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/css/font-awesome.min.css
rename to ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/css/font-awesome.min.css
diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/FontAwesome.otf b/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/FontAwesome.otf
similarity index 100%
rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/FontAwesome.otf
rename to ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/FontAwesome.otf
diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.eot b/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.eot
similarity index 100%
rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.eot
rename to ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.eot
diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.svg b/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.svg
similarity index 100%
rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.svg
rename to ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.svg
diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf b/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf
rename to ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf
diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff b/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff
similarity index 100%
rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff
rename to ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff
diff --git a/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2 b/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2
rename to ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/public/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2
diff --git a/ide/che-core-orion-editor/pom.xml b/ide/che-core-orion-editor/pom.xml
index f79623f201..40c309ba6f 100644
--- a/ide/che-core-orion-editor/pom.xml
+++ b/ide/che-core-orion-editor/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-orion-editor</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Orion :: Editor</name>
     <properties>
         <findbugs.failonerror>false</findbugs.failonerror>
@@ -88,6 +88,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-ide-ui</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.lib</groupId>
+            <artifactId>che-orion-editor</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.vectomatic</groupId>
             <artifactId>lib-gwt-svg</artifactId>
@@ -100,9 +104,6 @@
     </dependencies>
     <build>
         <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
             <resource>
                 <directory>src/main/resources</directory>
             </resource>
@@ -110,5 +111,31 @@
                 <directory>target/requirejs-${requirejs.upstream.version}</directory>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.ide.editor.orion.OrionEditor</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.lib:che-orion-editor</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/ide/che-core-orion-editor/src/main/resources/org/eclipse/che/ide/editor/orion/OrionEditor.gwt.xml b/ide/che-core-orion-editor/src/main/module.gwt.xml
similarity index 79%
rename from ide/che-core-orion-editor/src/main/resources/org/eclipse/che/ide/editor/orion/OrionEditor.gwt.xml
rename to ide/che-core-orion-editor/src/main/module.gwt.xml
index c82d13d10e..202b07ebfb 100644
--- a/ide/che-core-orion-editor/src/main/resources/org/eclipse/che/ide/editor/orion/OrionEditor.gwt.xml
+++ b/ide/che-core-orion-editor/src/main/module.gwt.xml
@@ -13,7 +13,6 @@
 -->
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
 <module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="org.eclipse.che.ide.Api"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
+  <inherits name="org.eclipse.che.orion.CheOrion"/>
+  <inherits name="org.eclipse.che.Requirejs"/>
 </module>
diff --git a/ide/che-ide-core/pom.xml b/ide/che-ide-core/pom.xml
index f9b90b7835..5b168ceb6a 100644
--- a/ide/che-ide-core/pom.xml
+++ b/ide/che-ide-core/pom.xml
@@ -21,7 +21,7 @@
     </parent>
     <groupId>org.eclipse.che.core</groupId>
     <artifactId>che-ide-core</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Core  IDE :: Basic IDE</name>
     <dependencies>
         <dependency>
@@ -68,37 +68,47 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-gwt</artifactId>
         </dependency>
+        <!-- to be able to use source root as-is in GWT Super DevMode -->
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-commons-gwt</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-inject</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-commons-j2ee</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-gwt-logger</artifactId>
+            <type>gwt-lib</type>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-ide-api</artifactId>
+            <type>gwt-lib</type>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-ide-app</artifactId>
+            <type>gwt-lib</type>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-orion-editor</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.lib</groupId>
-            <artifactId>che-orion-editor</artifactId>
+            <type>gwt-lib</type>
         </dependency>
     </dependencies>
     <build>
         <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.ide.Basic</moduleName>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
diff --git a/ide/che-ide-gwt-app/pom.xml b/ide/che-ide-gwt-app/pom.xml
new file mode 100644
index 0000000000..d029eabdbb
--- /dev/null
+++ b/ide/che-ide-gwt-app/pom.xml
@@ -0,0 +1,364 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2017 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>che-parent</artifactId>
+        <groupId>org.eclipse.che</groupId>
+        <version>6.0.0-M1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>che-ide-gwt-app</artifactId>
+    <packaging>gwt-app</packaging>
+    <name>Che IDE :: GWT App</name>
+    <description>Compiles Che IDE GWT application and packages it as a WAR-like archive which contains pure output of the GWT compiler</description>
+    <properties>
+        <generated.sources.directory>${project.build.directory}/generated-sources/gen</generated.sources.directory>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <!-- gwt-dev is required in classpath for launching GWT tools (compiler, codeserver, etc.) by gwt-maven-plugin -->
+        <dependency>
+            <groupId>com.google.gwt</groupId>
+            <artifactId>gwt-dev</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-ide-core</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-activity-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-composer-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-cpp-lang-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-csharp-lang-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-debugger-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-ext-dashboard-client</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-gdb-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-git-ext-git</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-github-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-github-pullrequest</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-gwt-ext-gwt</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-help-ext-client</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-java-debugger-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-java-ext-lang-client</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-java-plain-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-keybinding-eclipse-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-languageserver-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-machine-ssh-client</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-maven-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-nodejs-debugger-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-nodejs-lang-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-orion-compare</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-php-lang-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-product-info</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-pullrequest-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-python-lang-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-sdk-ext-plugins</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-ssh-key-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-testing-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-testing-junit-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-testing-phpunit-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-testing-testng-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-web-ext-web</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-yaml-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-zend-debugger-ide</artifactId>
+            <type>gwt-lib</type>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.ide.IDE</moduleName>
+                    <moduleShortName>_app</moduleShortName>
+                    <jvmArgs>
+                        <arg>${gwt.compiler.jvmArgs.Xss}</arg>
+                        <arg>${gwt.compiler.jvmArgs.Xmx}</arg>
+                    </jvmArgs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-ExtensionManager</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>org.eclipse.che.util.ExtensionManagerGenerator</mainClass>
+                            <arguments>
+                                <argument>--rootDir=${generated.sources.directory}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>generate-IDEInjector</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>org.eclipse.che.util.IDEInjectorGenerator</mainClass>
+                            <arguments>
+                                <argument>--rootDir=${generated.sources.directory}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>generate-DtoRegistry</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>org.eclipse.che.util.DtoFactoryVisitorRegistryGenerator</mainClass>
+                            <arguments>
+                                <argument>--rootDir=${generated.sources.directory}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-dyna-provider-generator-maven-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <outputDirectory>${generated.sources.directory}</outputDirectory>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <timestampFormat>{0, date, yyyy-MM-dd HH:mm:ss}</timestampFormat>
+                    <buildNumberPropertyName>revision</buildNumberPropertyName>
+                    <doCheck>false</doCheck>
+                    <doUpdate>false</doUpdate>
+                    <shortRevisionLength>16</shortRevisionLength>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>buildnumber</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <echo append="false" file="${project.build.directory}/classes/org/eclipse/che/ide/ext/help/client/BuildInfo.properties">revision = ${revision}
+                                    buildTime = ${timestamp}
+                                    version = ${project.version}</echo>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- pass the generated sources to compiler:compile -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${generated.sources.directory}</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/ide/che-ide-gwt-app/src/main/module.gwt.xml b/ide/che-ide-gwt-app/src/main/module.gwt.xml
new file mode 100644
index 0000000000..0da3262f3f
--- /dev/null
+++ b/ide/che-ide-gwt-app/src/main/module.gwt.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2017 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<module>
+    <stylesheet src="IDE.css"/>
+    <entry-point class="org.eclipse.che.ide.client.IDE"/>
+</module>
diff --git a/assembly/assembly-ide-war/src/main/resources/org/eclipse/che/ide/public/IDE.css b/ide/che-ide-gwt-app/src/main/resources/org/eclipse/che/ide/public/IDE.css
similarity index 100%
rename from assembly/assembly-ide-war/src/main/resources/org/eclipse/che/ide/public/IDE.css
rename to ide/che-ide-gwt-app/src/main/resources/org/eclipse/che/ide/public/IDE.css
diff --git a/ide/gwt-logger/pom.xml b/ide/gwt-logger/pom.xml
index d5eb0a45bb..fa346e9733 100644
--- a/ide/gwt-logger/pom.xml
+++ b/ide/gwt-logger/pom.xml
@@ -19,6 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-gwt-logger</artifactId>
+    <packaging>gwt-lib</packaging>
     <name>Che Core :: Commons :: GWT Logger</name>
     <dependencies>
         <dependency>
@@ -45,41 +46,13 @@
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-sources</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/java</directory>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-emulation</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.outputDirectory}/org/eclipse/che/ide/logger/slf4j/emulation</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/emulation</directory>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.ide.logger.slf4j.Logging</moduleName>
+                    <relocateSuperSource>true</relocateSuperSource>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>com.mycila</groupId>
@@ -87,28 +60,10 @@
                 <configuration>
                     <excludes>
                         <!-- MIT license -->
-                        <exclude>src/main/emulation/**</exclude>
+                        <exclude>src/main/super/**</exclude>
                     </excludes>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/main/emulation</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -127,7 +82,7 @@
                                     <classifier>sources</classifier>
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.outputDirectory}/org/eclipse/che/ide/logger/slf4j/emulation</outputDirectory>
+                                    <outputDirectory>${project.build.outputDirectory}/org/eclipse/che/ide/logger/slf4j/super</outputDirectory>
                                     <includes>org/slf4j/helpers/FormattingTuple.java,
                                         org/slf4j/helpers/MarkerIgnoringBase.java,
                                         org/slf4j/helpers/MessageFormatter.java,
diff --git a/ide/gwt-logger/src/main/resources/org/eclipse/che/ide/logger/slf4j/Logging.gwt.xml b/ide/gwt-logger/src/main/module.gwt.xml
similarity index 96%
rename from ide/gwt-logger/src/main/resources/org/eclipse/che/ide/logger/slf4j/Logging.gwt.xml
rename to ide/gwt-logger/src/main/module.gwt.xml
index e0b311c3b2..4b42def2dd 100644
--- a/ide/gwt-logger/src/main/resources/org/eclipse/che/ide/logger/slf4j/Logging.gwt.xml
+++ b/ide/gwt-logger/src/main/module.gwt.xml
@@ -14,7 +14,7 @@
     <inherits name="com.google.gwt.core.Core"/>
     <inherits name="com.google.gwt.logging.Logging"/>
 
-    <super-source path="emulation"/>
+    <super-source path="super"/>
     <source path="gwtbackend"/>
 
     <replace-with class="org.eclipse.che.ide.logger.slf4j.gwtbackend.GWTLoggerFactory">
diff --git a/ide/gwt-logger/src/main/emulation/org/slf4j/LoggerFactory.java b/ide/gwt-logger/src/main/super/org/slf4j/LoggerFactory.java
similarity index 100%
rename from ide/gwt-logger/src/main/emulation/org/slf4j/LoggerFactory.java
rename to ide/gwt-logger/src/main/super/org/slf4j/LoggerFactory.java
diff --git a/ide/gwt-logger/src/main/emulation/org/slf4j/helpers/NamedLoggerBase.java b/ide/gwt-logger/src/main/super/org/slf4j/helpers/NamedLoggerBase.java
similarity index 100%
rename from ide/gwt-logger/src/main/emulation/org/slf4j/helpers/NamedLoggerBase.java
rename to ide/gwt-logger/src/main/super/org/slf4j/helpers/NamedLoggerBase.java
diff --git a/infrastructures/docker/docker-client/pom.xml b/infrastructures/docker/docker-client/pom.xml
index 5eb0526245..480b7275fe 100644
--- a/infrastructures/docker/docker-client/pom.xml
+++ b/infrastructures/docker/docker-client/pom.xml
@@ -130,17 +130,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.eclipse.che.core</groupId>
diff --git a/multiuser/api/che-multiuser-api-organization/pom.xml b/multiuser/api/che-multiuser-api-organization/pom.xml
index 0cb93d3f7c..28e8337d3e 100644
--- a/multiuser/api/che-multiuser-api-organization/pom.xml
+++ b/multiuser/api/che-multiuser-api-organization/pom.xml
@@ -208,17 +208,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.eclipse.che.core</groupId>
diff --git a/multiuser/api/che-multiuser-api-permission/pom.xml b/multiuser/api/che-multiuser-api-permission/pom.xml
index 415b2379c8..394b5caebd 100644
--- a/multiuser/api/che-multiuser-api-permission/pom.xml
+++ b/multiuser/api/che-multiuser-api-permission/pom.xml
@@ -187,17 +187,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.eclipse.che.core</groupId>
diff --git a/multiuser/api/che-multiuser-api-resource/pom.xml b/multiuser/api/che-multiuser-api-resource/pom.xml
index 4d06d91ff0..d0f7690341 100644
--- a/multiuser/api/che-multiuser-api-resource/pom.xml
+++ b/multiuser/api/che-multiuser-api-resource/pom.xml
@@ -189,17 +189,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.eclipse.che.core</groupId>
diff --git a/multiuser/keycloak/che-multiuser-keycloak-ide/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-ide/pom.xml
index ff429dd9fd..7274d8cd1a 100644
--- a/multiuser/keycloak/che-multiuser-keycloak-ide/pom.xml
+++ b/multiuser/keycloak/che-multiuser-keycloak-ide/pom.xml
@@ -20,7 +20,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>che-multiuser-keycloak-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Multiuser :: Keycloak IDE</name>
     <dependencies>
         <dependency>
@@ -47,6 +47,11 @@
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-keycloak-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.multiuser</groupId>
+            <artifactId>che-multiuser-keycloak-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-machine-authentication-ide</artifactId>
@@ -58,13 +63,31 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.multiuser.keycloak.Keycloak</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.multiuser:che-multiuser-keycloak-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/resources/org/eclipse/che/multiuser/machine/authentication/Authentication.gwt.xml b/multiuser/keycloak/che-multiuser-keycloak-ide/src/main/module.gwt.xml
similarity index 94%
rename from multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/resources/org/eclipse/che/multiuser/machine/authentication/Authentication.gwt.xml
rename to multiuser/keycloak/che-multiuser-keycloak-ide/src/main/module.gwt.xml
index 906ea2309a..247868b14f 100644
--- a/multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/resources/org/eclipse/che/multiuser/machine/authentication/Authentication.gwt.xml
+++ b/multiuser/keycloak/che-multiuser-keycloak-ide/src/main/module.gwt.xml
@@ -17,7 +17,6 @@
     <inherits name="com.google.gwt.http.HTTP"/>
     <inherits name="com.google.gwt.i18n.I18N"/>
     <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
     <inherits name="com.google.gwt.inject.Inject"/>
 
     <source path="ide"/>
diff --git a/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml
index 33fb8b3b17..8543ccb0b8 100644
--- a/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml
+++ b/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml
@@ -28,14 +28,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml b/multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml
index 74d5250c7b..9dda722828 100644
--- a/multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml
+++ b/multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml
@@ -19,6 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-multiuser-machine-authentication-ide</artifactId>
+    <packaging>gwt-lib</packaging>
     <name>Che Multiuser :: Machine Authentication IDE</name>
     <properties>
         <dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
@@ -49,6 +50,11 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-user-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-user-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-gwt</artifactId>
@@ -61,6 +67,11 @@
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-machine-authentication-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.multiuser</groupId>
+            <artifactId>che-multiuser-machine-authentication-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>
             <artifactId>gwt-user</artifactId>
@@ -68,12 +79,7 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
         <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
             <resource>
                 <directory>src/main/resources</directory>
             </resource>
@@ -82,6 +88,14 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.multiuser.machine.authentication.Authentication</moduleName>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -156,6 +170,24 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.core:che-core-api-user-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-model</dep>
+                                <dep>org.eclipse.che.multiuser:che-multiuser-machine-authentication-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/multiuser/keycloak/che-multiuser-keycloak-ide/src/main/resources/org/eclipse/che/multiuser/keycloak/Keycloak.gwt.xml b/multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/module.gwt.xml
similarity index 94%
rename from multiuser/keycloak/che-multiuser-keycloak-ide/src/main/resources/org/eclipse/che/multiuser/keycloak/Keycloak.gwt.xml
rename to multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/module.gwt.xml
index 906ea2309a..247868b14f 100644
--- a/multiuser/keycloak/che-multiuser-keycloak-ide/src/main/resources/org/eclipse/che/multiuser/keycloak/Keycloak.gwt.xml
+++ b/multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/module.gwt.xml
@@ -17,7 +17,6 @@
     <inherits name="com.google.gwt.http.HTTP"/>
     <inherits name="com.google.gwt.i18n.I18N"/>
     <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
     <inherits name="com.google.gwt.inject.Inject"/>
 
     <source path="ide"/>
diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml b/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml
index 0af725c01a..cf4eef3fc3 100644
--- a/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml
+++ b/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml
@@ -27,11 +27,4 @@
             <artifactId>che-core-api-dto</artifactId>
         </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml b/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml
index f334342a57..4ddc52f415 100644
--- a/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml
+++ b/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml
@@ -162,17 +162,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/plugins/plugin-activity/che-plugin-activity-ide/pom.xml b/plugins/plugin-activity/che-plugin-activity-ide/pom.xml
index 406ed3c01b..476609ef77 100644
--- a/plugins/plugin-activity/che-plugin-activity-ide/pom.xml
+++ b/plugins/plugin-activity/che-plugin-activity-ide/pom.xml
@@ -20,7 +20,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>che-plugin-activity-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Activity :: IDE</name>
     <dependencies>
         <dependency>
@@ -37,13 +37,15 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.activity.ActivityModule</moduleName>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-activity/che-plugin-activity-ide/src/main/resources/org/eclipse/che/plugin/activity/ActivityModule.gwt.xml b/plugins/plugin-activity/che-plugin-activity-ide/src/main/module.gwt.xml
similarity index 94%
rename from plugins/plugin-activity/che-plugin-activity-ide/src/main/resources/org/eclipse/che/plugin/activity/ActivityModule.gwt.xml
rename to plugins/plugin-activity/che-plugin-activity-ide/src/main/module.gwt.xml
index c923d288a3..3c448e0b98 100644
--- a/plugins/plugin-activity/che-plugin-activity-ide/src/main/resources/org/eclipse/che/plugin/activity/ActivityModule.gwt.xml
+++ b/plugins/plugin-activity/che-plugin-activity-ide/src/main/module.gwt.xml
@@ -13,7 +13,5 @@
 <module>
     <inherits name="com.google.gwt.user.User"/>
 
-    <public path="public"/>
-
     <source path="ide"/>
 </module>
diff --git a/plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml b/plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml
index 3daca882b6..841fbb09a7 100644
--- a/plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml
+++ b/plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml
@@ -124,14 +124,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/plugins/plugin-composer/che-plugin-composer-ide/pom.xml b/plugins/plugin-composer/che-plugin-composer-ide/pom.xml
index 7b4174d72b..16483060c9 100644
--- a/plugins/plugin-composer/che-plugin-composer-ide/pom.xml
+++ b/plugins/plugin-composer/che-plugin-composer-ide/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-composer-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Composer :: IDE</name>
     <dependencies>
         <dependency>
@@ -42,10 +42,20 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-core</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-project-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-project-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-gwt</artifactId>
@@ -66,10 +76,20 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-composer-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-composer-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-php-lang-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-php-lang-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>
             <artifactId>gwt-user</artifactId>
@@ -77,13 +97,34 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.composer.Composer</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.core:che-core-api-core</dep>
+                                <dep>org.eclipse.che.core:che-core-api-project-shared</dep>
+                                <dep>org.eclipse.che.plugin:che-plugin-composer-shared</dep>
+                                <dep>org.eclipse.che.plugin:che-plugin-php-lang-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-composer/che-plugin-composer-ide/src/main/resources/org/eclipse/che/plugin/composer/Composer.gwt.xml b/plugins/plugin-composer/che-plugin-composer-ide/src/main/module.gwt.xml
similarity index 86%
rename from plugins/plugin-composer/che-plugin-composer-ide/src/main/resources/org/eclipse/che/plugin/composer/Composer.gwt.xml
rename to plugins/plugin-composer/che-plugin-composer-ide/src/main/module.gwt.xml
index a165427c89..e5ff3d18f5 100644
--- a/plugins/plugin-composer/che-plugin-composer-ide/src/main/resources/org/eclipse/che/plugin/composer/Composer.gwt.xml
+++ b/plugins/plugin-composer/che-plugin-composer-ide/src/main/module.gwt.xml
@@ -17,11 +17,8 @@
     <inherits name="com.google.gwt.http.HTTP"/>
     <inherits name="com.google.gwt.i18n.I18N"/>
     <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name='org.eclipse.che.ide.ui.CodenvyUI'/>
     <inherits name="com.google.gwt.inject.Inject"/>
     <inherits name="org.eclipse.che.api.project.Project"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
 
     <source path="ide"/>
     <source path="shared"/>
diff --git a/plugins/plugin-composer/che-plugin-composer-server/pom.xml b/plugins/plugin-composer/che-plugin-composer-server/pom.xml
index bed63912fe..8ca2a57fcf 100644
--- a/plugins/plugin-composer/che-plugin-composer-server/pom.xml
+++ b/plugins/plugin-composer/che-plugin-composer-server/pom.xml
@@ -79,16 +79,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-            </testResource>
-        </testResources>
-    </build>
 </project>
diff --git a/plugins/plugin-composer/che-plugin-composer-shared/pom.xml b/plugins/plugin-composer/che-plugin-composer-shared/pom.xml
index 841c3f38fb..c98f4d569e 100644
--- a/plugins/plugin-composer/che-plugin-composer-shared/pom.xml
+++ b/plugins/plugin-composer/che-plugin-composer-shared/pom.xml
@@ -48,17 +48,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml
index 2e3b8e5e2d..973941e789 100644
--- a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml
+++ b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-cpp-lang-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: C/C++ :: IDE</name>
     <dependencies>
         <dependency>
@@ -50,6 +50,11 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-cpp-lang-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-cpp-lang-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.vectomatic</groupId>
             <artifactId>lib-gwt-svg</artifactId>
@@ -61,13 +66,31 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.cpp.Cpp</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.plugin:che-plugin-cpp-lang-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/main/resources/org/eclipse/che/ide/ext/gwt/GWT.gwt.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/module.gwt.xml
similarity index 90%
rename from plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/main/resources/org/eclipse/che/ide/ext/gwt/GWT.gwt.xml
rename to plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/module.gwt.xml
index dc1f289c51..2ae5274432 100644
--- a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/main/resources/org/eclipse/che/ide/ext/gwt/GWT.gwt.xml
+++ b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/module.gwt.xml
@@ -17,9 +17,9 @@
     <inherits name="com.google.gwt.http.HTTP"/>
     <inherits name="com.google.gwt.i18n.I18N"/>
     <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
     <inherits name="com.google.gwt.inject.Inject"/>
+    <inherits name="org.eclipse.che.api.project.Project"/>
 
-    <source path="client"/>
+    <source path="ide"/>
     <source path="shared"/>
 </module>
diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/resources/org/eclipse/che/plugin/cpp/Cpp.gwt.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/resources/org/eclipse/che/plugin/cpp/Cpp.gwt.xml
deleted file mode 100644
index 475e33505e..0000000000
--- a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/resources/org/eclipse/che/plugin/cpp/Cpp.gwt.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name='org.eclipse.che.ide.ui.CodenvyUI'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.api.project.Project"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-
-    <source path="ide"/>
-    <source path="shared"/>
-</module>
diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml
index d1b4c80476..833bddde66 100644
--- a/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml
+++ b/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml
@@ -27,14 +27,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml
index 53cb7db6f2..85892946e3 100644
--- a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml
+++ b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-csharp-lang-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: C# :: IDE</name>
     <dependencies>
         <dependency>
@@ -50,6 +50,11 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-csharp-lang-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-csharp-lang-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.vectomatic</groupId>
             <artifactId>lib-gwt-svg</artifactId>
@@ -61,13 +66,31 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.csharp.CSharp</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.plugin:che-plugin-csharp-lang-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/src/main/module.gwt.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/src/main/module.gwt.xml
new file mode 100644
index 0000000000..2ae5274432
--- /dev/null
+++ b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/src/main/module.gwt.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2017 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
+<module>
+    <inherits name="com.google.gwt.user.User"/>
+    <inherits name="com.google.gwt.http.HTTP"/>
+    <inherits name="com.google.gwt.i18n.I18N"/>
+    <inherits name="com.google.gwt.json.JSON"/>
+    <inherits name="com.google.gwt.inject.Inject"/>
+    <inherits name="org.eclipse.che.api.project.Project"/>
+
+    <source path="ide"/>
+    <source path="shared"/>
+</module>
diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/src/main/resources/org/eclipse/che/plugin/csharp/CSharp.gwt.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/src/main/resources/org/eclipse/che/plugin/csharp/CSharp.gwt.xml
deleted file mode 100644
index 475e33505e..0000000000
--- a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/src/main/resources/org/eclipse/che/plugin/csharp/CSharp.gwt.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name='org.eclipse.che.ide.ui.CodenvyUI'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.api.project.Project"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-
-    <source path="ide"/>
-    <source path="shared"/>
-</module>
diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml
index 4e8e13b883..b78a1774c4 100644
--- a/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml
+++ b/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml
@@ -27,14 +27,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml b/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml
index c97d712cf6..d7dfcde7de 100644
--- a/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml
+++ b/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-ext-dashboard-client</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Dashboard :: Client</name>
     <properties>
         <dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
@@ -53,23 +53,15 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.ide.ext.dashboard.Dashboard</moduleName>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml b/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml
index 20f20ac259..6d862ec124 100644
--- a/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml
+++ b/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-debugger-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Debugger :: Extension Debugger IDE</name>
     <properties>
         <dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
@@ -57,6 +57,11 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-debug-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-debug-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-dto</artifactId>
@@ -65,6 +70,11 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-model</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-model</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-annotations</artifactId>
@@ -121,12 +131,7 @@
         </dependency>
     </dependencies>
     <build>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
         <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
             <resource>
                 <directory>src/main/resources</directory>
             </resource>
@@ -134,12 +139,15 @@
                 <directory>${dto-generator-out-directory}</directory>
             </resource>
         </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
         <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.debugger.Debugger</moduleName>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -219,13 +227,21 @@
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/*.png</exclude>
-                    </excludes>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.core:che-core-api-debug-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-model</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/module.gwt.xml b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/module.gwt.xml
new file mode 100644
index 0000000000..d75e964034
--- /dev/null
+++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/module.gwt.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2017 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
+<module>
+    <inherits name="org.eclipse.che.api.debug.Debug"/>
+
+    <source path="ide"/>
+</module>
diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/resources/org/eclipse/che/plugin/debugger/Debugger.gwt.xml b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/resources/org/eclipse/che/plugin/debugger/Debugger.gwt.xml
deleted file mode 100644
index da7fe46a36..0000000000
--- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/resources/org/eclipse/che/plugin/debugger/Debugger.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-    <inherits name="org.eclipse.che.api.debug.Debug"/>
-
-    <source path="ide"/>
-    <source path="shared"/>
-</module>
diff --git a/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml b/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml
index 4a0a174bf8..fc3ef34509 100644
--- a/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml
+++ b/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-gdb-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: GDB :: GDB IDE</name>
     <dependencies>
         <dependency>
@@ -46,6 +46,11 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-core</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-project</artifactId>
@@ -114,22 +119,15 @@
         </dependency>
     </dependencies>
     <build>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
         <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.gdb.Gdb</moduleName>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -146,15 +144,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/*.png</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/module.gwt.xml b/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/module.gwt.xml
new file mode 100644
index 0000000000..b32b29bbfe
--- /dev/null
+++ b/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/module.gwt.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2017 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
+<module>
+    <inherits name="com.google.gwt.user.User"/>
+    <inherits name="com.google.gwt.http.HTTP"/>
+    <inherits name="com.google.gwt.i18n.I18N"/>
+    <inherits name="com.google.gwt.json.JSON"/>
+    <inherits name="com.google.gwt.inject.Inject"/>
+    <inherits name="org.eclipse.che.api.debug.Debug"/>
+
+    <source path="ide"/>
+</module>
diff --git a/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/resources/org/eclipse/che/plugin/gdb/Gdb.gwt.xml b/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/resources/org/eclipse/che/plugin/gdb/Gdb.gwt.xml
deleted file mode 100644
index db22d29be0..0000000000
--- a/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/resources/org/eclipse/che/plugin/gdb/Gdb.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-    <inherits name="org.eclipse.che.plugin.debugger.Debugger"/>
-    <inherits name="org.eclipse.che.api.debug.Debug"/>
-
-    <source path="ide"/>
-</module>
diff --git a/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml b/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml
index 07c44c303a..c9921d1487 100644
--- a/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml
+++ b/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml
@@ -75,14 +75,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml
index 22123aed3f..b428cfbefb 100644
--- a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml
+++ b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-git-ext-git</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Git :: Extension</name>
     <properties>
         <dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
@@ -57,14 +57,29 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-git-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-git-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-model</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-model</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-project-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-project-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-annotations</artifactId>
@@ -114,6 +129,12 @@
             <artifactId>che-core-api-workspace-shared</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-workspace-shared</artifactId>
+            <classifier>sources</classifier>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.vectomatic</groupId>
             <artifactId>lib-gwt-svg</artifactId>
@@ -156,13 +177,7 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
         <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
             <resource>
                 <directory>src/main/resources</directory>
             </resource>
@@ -170,15 +185,15 @@
                 <directory>${project.build.directory}/generated-sources/dto/</directory>
             </resource>
         </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
         <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.ide.ext.git.Git</moduleName>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -269,6 +284,24 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.core:che-core-api-project-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-model</dep>
+                                <dep>org.eclipse.che.core:che-core-api-git-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/Git.gwt.xml b/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/Git.gwt.xml
deleted file mode 100644
index c596b64c2b..0000000000
--- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/Git.gwt.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name="com.google.common.base.Base"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-    <inherits name="org.eclipse.che.api.git.Git"/>
-    <inherits name="org.eclipse.che.ide.ui.CodenvyUI"/>
-  <inherits name="org.eclipse.che.ide.orion.OrionCompare"/>
-
-  <source path="client"/>
-</module>
diff --git a/plugins/plugin-github/che-plugin-github-ide/pom.xml b/plugins/plugin-github/che-plugin-github-ide/pom.xml
index 4175ba7d38..dbd236e59d 100644
--- a/plugins/plugin-github/che-plugin-github-ide/pom.xml
+++ b/plugins/plugin-github/che-plugin-github-ide/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-github-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Github :: IDE</name>
     <properties>
         <dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
@@ -49,6 +49,11 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-ssh-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-ssh-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-gwt</artifactId>
@@ -69,6 +74,11 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-github-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-github-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-ssh-key-ide</artifactId>
@@ -116,9 +126,6 @@
     </dependencies>
     <build>
         <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
             <resource>
                 <directory>src/main/resources</directory>
             </resource>
@@ -126,15 +133,15 @@
                 <directory>${project.build.directory}/generated-sources/dto/</directory>
             </resource>
         </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
         <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.github.GitHub</moduleName>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -209,6 +216,23 @@
                     <impl>client</impl>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.core:che-core-api-ssh-shared</dep>
+                                <dep>org.eclipse.che.plugin:che-plugin-github-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-github/che-plugin-github-ide/src/main/module.gwt.xml b/plugins/plugin-github/che-plugin-github-ide/src/main/module.gwt.xml
new file mode 100644
index 0000000000..94706cb634
--- /dev/null
+++ b/plugins/plugin-github/che-plugin-github-ide/src/main/module.gwt.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2017 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
+<module>
+    <inherits name="org.eclipse.che.api.user.User"/>
+    <inherits name="org.eclipse.che.security.OAuth"/>
+    <inherits name="org.eclipse.che.api.git.Git"/>
+    <inherits name="org.eclipse.che.api.ssh.Ssh"/>
+
+    <source path="ide"/>
+    <source path="shared"/>
+</module>
diff --git a/plugins/plugin-github/che-plugin-github-ide/src/main/resources/org/eclipse/che/plugin/github/GitHub.gwt.xml b/plugins/plugin-github/che-plugin-github-ide/src/main/resources/org/eclipse/che/plugin/github/GitHub.gwt.xml
deleted file mode 100644
index dcc027027a..0000000000
--- a/plugins/plugin-github/che-plugin-github-ide/src/main/resources/org/eclipse/che/plugin/github/GitHub.gwt.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.api.user.User"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-    <inherits name="org.eclipse.che.ide.ui.CodenvyUI"/>
-    <inherits name="org.eclipse.che.security.OAuth"/>
-    <inherits name="org.eclipse.che.api.git.Git"/>
-    <inherits name="org.eclipse.che.api.ssh.Ssh"/>
-    <inherits name="com.google.common.base.Base"/>
-    <inherits name="org.eclipse.che.plugin.ssh.key.SshKey"/>
-
-    <source path="ide"/>
-    <source path="shared"/>
-</module>
diff --git a/plugins/plugin-github/che-plugin-github-oauth2/pom.xml b/plugins/plugin-github/che-plugin-github-oauth2/pom.xml
index e4ae47d139..76eab6ca0f 100644
--- a/plugins/plugin-github/che-plugin-github-oauth2/pom.xml
+++ b/plugins/plugin-github/che-plugin-github-oauth2/pom.xml
@@ -67,16 +67,4 @@
             <artifactId>che-core-commons-json</artifactId>
         </dependency>
     </dependencies>
-    <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml b/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml
index 4bc605a4bb..55d7410fc4 100644
--- a/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml
+++ b/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml
@@ -19,6 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-github-pullrequest</artifactId>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Github :: Pull request</name>
     <properties>
         <dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
@@ -64,6 +65,11 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-github-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-github-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-pullrequest-ide</artifactId>
@@ -72,6 +78,11 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-pullrequest-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-pullrequest-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>
             <artifactId>gwt-user</artifactId>
@@ -115,13 +126,32 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.pullrequest.GithubPullRequest</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.plugin:che-plugin-pullrequest-shared</dep>
+                                <dep>org.eclipse.che.plugin:che-plugin-github-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-github/che-plugin-github-pullrequest/src/main/resources/org/eclipse/che/plugin/pullrequest/GithubPullRequest.gwt.xml b/plugins/plugin-github/che-plugin-github-pullrequest/src/main/module.gwt.xml
similarity index 61%
rename from plugins/plugin-github/che-plugin-github-pullrequest/src/main/resources/org/eclipse/che/plugin/pullrequest/GithubPullRequest.gwt.xml
rename to plugins/plugin-github/che-plugin-github-pullrequest/src/main/module.gwt.xml
index 1fb0057c78..31031ae320 100644
--- a/plugins/plugin-github/che-plugin-github-pullrequest/src/main/resources/org/eclipse/che/plugin/pullrequest/GithubPullRequest.gwt.xml
+++ b/plugins/plugin-github/che-plugin-github-pullrequest/src/main/module.gwt.xml
@@ -12,16 +12,7 @@
 
 -->
 <module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-
     <inherits name='org.eclipse.che.api.workspace.Workspace'/>
     <inherits name="org.eclipse.che.api.project.Project"/>
     <inherits name="org.eclipse.che.security.OAuth"/>
-
-    <inherits name="org.eclipse.che.plugin.github.GitHub"/>
-    <inherits name="org.eclipse.che.plugin.pullrequest.PullRequest"/>
 </module>
diff --git a/plugins/plugin-github/che-plugin-github-server/pom.xml b/plugins/plugin-github/che-plugin-github-server/pom.xml
index 4eb1513495..ad6b5f4da2 100644
--- a/plugins/plugin-github/che-plugin-github-server/pom.xml
+++ b/plugins/plugin-github/che-plugin-github-server/pom.xml
@@ -99,25 +99,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${project.build.directory}/generated-sources/dto/</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/plugins/plugin-github/che-plugin-github-shared/pom.xml b/plugins/plugin-github/che-plugin-github-shared/pom.xml
index 57fa9ba4c3..b347af5f65 100644
--- a/plugins/plugin-github/che-plugin-github-shared/pom.xml
+++ b/plugins/plugin-github/che-plugin-github-shared/pom.xml
@@ -30,11 +30,4 @@
             <artifactId>che-core-commons-annotations</artifactId>
         </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml
index b8e6111b18..6dc2abb178 100644
--- a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml
+++ b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-gwt-ext-gwt</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: GWT</name>
     <dependencies>
         <dependency>
@@ -83,21 +83,15 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.ide.ext.gwt.GWT</moduleName>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-help/che-plugin-help-ext-client/pom.xml b/plugins/plugin-help/che-plugin-help-ext-client/pom.xml
index 17155a0b22..899521e4ea 100644
--- a/plugins/plugin-help/che-plugin-help-ext-client/pom.xml
+++ b/plugins/plugin-help/che-plugin-help-ext-client/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-help-ext-client</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Help :: Client</name>
     <dependencies>
         <dependency>
@@ -62,23 +62,15 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.ide.ext.help.HelpAboutExtension</moduleName>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-help/che-plugin-help-ext-client/src/main/resources/org/eclipse/che/ide/ext/help/HelpAboutExtension.gwt.xml b/plugins/plugin-help/che-plugin-help-ext-client/src/main/resources/org/eclipse/che/ide/ext/help/HelpAboutExtension.gwt.xml
deleted file mode 100644
index 598fe0fd63..0000000000
--- a/plugins/plugin-help/che-plugin-help-ext-client/src/main/resources/org/eclipse/che/ide/ext/help/HelpAboutExtension.gwt.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-
-    <source path="client"/>
-    <source path="shared"/>
-</module>
\ No newline at end of file
diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml
index 4cfd5fbbce..92f96dd18c 100644
--- a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml
+++ b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-java-debugger-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Java :: Java Debugger IDE</name>
     <dependencies>
         <dependency>
@@ -38,6 +38,11 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-core</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-debug-shared</artifactId>
@@ -46,6 +51,11 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-model</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-model</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-gwt</artifactId>
@@ -106,27 +116,35 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
         <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.jdb.JavaDebugger</moduleName>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/*.png</exclude>
-                    </excludes>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.core:che-core-api-core</dep>
+                                <dep>org.eclipse.che.core:che-core-api-model</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/plugin-product-info/src/main/resources/org/eclipse/che/plugin/product/info/ProductInfo.gwt.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/main/module.gwt.xml
similarity index 91%
rename from plugins/plugin-product-info/src/main/resources/org/eclipse/che/plugin/product/info/ProductInfo.gwt.xml
rename to plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/main/module.gwt.xml
index 25a168459e..4ed37b9ea1 100644
--- a/plugins/plugin-product-info/src/main/resources/org/eclipse/che/plugin/product/info/ProductInfo.gwt.xml
+++ b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/main/module.gwt.xml
@@ -17,8 +17,7 @@
     <inherits name="com.google.gwt.http.HTTP"/>
     <inherits name="com.google.gwt.i18n.I18N"/>
     <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
     <inherits name="com.google.gwt.inject.Inject"/>
 
-    <source path="client"/>
+    <source path="ide"/>
 </module>
diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/main/resources/org/eclipse/che/plugin/jdb/JavaDebugger.gwt.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/main/resources/org/eclipse/che/plugin/jdb/JavaDebugger.gwt.xml
deleted file mode 100644
index 07e6042724..0000000000
--- a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/main/resources/org/eclipse/che/plugin/jdb/JavaDebugger.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-    <inherits name="org.eclipse.che.ide.ext.java.Java"/>
-    <inherits name="org.eclipse.che.plugin.debugger.Debugger"/>
-
-    <source path="ide"/>
-</module>
diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml
index d75384755c..1f9bd3d080 100644
--- a/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml
+++ b/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml
@@ -147,14 +147,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml
index 8f66c04e81..b607d4212d 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-java-ext-lang-client</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Java :: Extension Java Client</name>
     <dependencies>
         <dependency>
@@ -62,10 +62,20 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-model</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-model</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-project-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-project-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-annotations</artifactId>
@@ -94,6 +104,11 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-java-ext-lang-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-java-ext-lang-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-java-plain-ide</artifactId>
@@ -159,23 +174,15 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
         <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.ide.ext.java.Java</moduleName>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -213,6 +220,24 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.core:che-core-api-model</dep>
+                                <dep>org.eclipse.che.core:che-core-api-project-shared</dep>
+                                <dep>org.eclipse.che.plugin:che-plugin-java-ext-lang-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/module.gwt.xml b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/module.gwt.xml
new file mode 100644
index 0000000000..2a0c63afd7
--- /dev/null
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/module.gwt.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2017 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
+<module>
+    <source path="client"/>
+    <source path="shared"/>
+    <source path="jdt"/>
+</module>
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources/org/eclipse/che/ide/ext/java/Java.gwt.xml b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources/org/eclipse/che/ide/ext/java/Java.gwt.xml
deleted file mode 100644
index 9a82dc7545..0000000000
--- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources/org/eclipse/che/ide/ext/java/Java.gwt.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name='org.eclipse.che.ide.ui.CodenvyUI'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.api.project.Project"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-    <inherits name="org.eclipse.che.plugin.java.plain.PlainJava"/>
-    <inherits name="org.eclipse.che.ide.editor.orion.OrionEditor"/>
-    <inherits name="org.eclipse.che.ide.orion.OrionCompare"/>
-
-    <source path="client"/>
-    <source path="shared"/>
-    <source path="jdt"/>
-</module>
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml
index e5e625a9c7..8a9e034f93 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml
@@ -48,17 +48,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml
index b554d7c12d..51eb17f634 100644
--- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-java-plain-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Java :: Plain :: IDE</name>
     <dependencies>
         <dependency>
@@ -58,10 +58,20 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-java-ext-lang-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-java-ext-lang-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-java-plain-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-java-plain-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>
             <artifactId>gwt-user</artifactId>
@@ -89,13 +99,32 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.java.plain.PlainJava</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.plugin:che-plugin-java-plain-shared</dep>
+                                <dep>org.eclipse.che.plugin:che-plugin-java-ext-lang-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/src/main/resources/org/eclipse/che/plugin/java/plain/PlainJava.gwt.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/src/main/resources/org/eclipse/che/plugin/java/plain/PlainJava.gwt.xml
deleted file mode 100644
index d380cb6965..0000000000
--- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/src/main/resources/org/eclipse/che/plugin/java/plain/PlainJava.gwt.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.api.project.Project"/>
-    <inherits name="org.eclipse.che.ide.ext.java.Java"/>
-    <inherits name="org.eclipse.che.ide.ui.CodenvyUI"/>
-    <inherits name="org.eclipse.che.ide.ext.java.Java"/>
-
-    <source path="client"/>
-    <source path="shared"/>
-</module>
diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml
index c2784adff3..80944e6bd7 100644
--- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml
@@ -137,22 +137,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
-    </build>
 </project>
diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml
index e77a2a993e..9e7a9949c5 100644
--- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml
@@ -20,11 +20,4 @@
     </parent>
     <artifactId>che-plugin-java-plain-shared</artifactId>
     <name>Che Plugin :: Java :: Plain :: Shared</name>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml
index 89cbcb233e..c6e63e3d4b 100644
--- a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml
+++ b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml
@@ -20,7 +20,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>che-plugin-keybinding-eclipse-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Key Binding Eclipse :: IDE</name>
     <dependencies>
         <dependency>
@@ -49,15 +49,15 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
         <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.keybinding.EclipseKeyBinding</moduleName>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
diff --git a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.java b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/EclipseKeyBinding.java
similarity index 99%
rename from plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.java
rename to plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/EclipseKeyBinding.java
index 4ba39c4dfc..8fcb5e88d5 100644
--- a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.java
+++ b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/EclipseKeyBinding.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.plugin.keybinding.eclipse;
+package org.eclipse.che.plugin.keybinding;
 
 import static org.eclipse.che.ide.api.action.IdeActions.CLOSE_ACTIVE_EDITOR;
 import static org.eclipse.che.ide.api.action.IdeActions.FORMAT;
diff --git a/plugins/plugin-web/che-plugin-web-ext-shared/src/main/resources/org/eclipse/che/plugin/web/WebShared.gwt.xml b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/module.gwt.xml
similarity index 95%
rename from plugins/plugin-web/che-plugin-web-ext-shared/src/main/resources/org/eclipse/che/plugin/web/WebShared.gwt.xml
rename to plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/module.gwt.xml
index a38507d261..709ed8a885 100644
--- a/plugins/plugin-web/che-plugin-web-ext-shared/src/main/resources/org/eclipse/che/plugin/web/WebShared.gwt.xml
+++ b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/module.gwt.xml
@@ -13,5 +13,5 @@
 -->
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
 <module>
-    <source path="shared"/>
+    <source path=""/>
 </module>
diff --git a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/resources/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.gwt.xml b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/resources/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.gwt.xml
deleted file mode 100644
index 7895f6d695..0000000000
--- a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/resources/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name='org.eclipse.che.ide.ui.CodenvyUI'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.api.project.Project"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-
-    <source path=""/>
-</module>
diff --git a/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml b/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml
index d46f622428..8345a60524 100644
--- a/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml
+++ b/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml
@@ -20,7 +20,7 @@
         <relativePath>..</relativePath>
     </parent>
     <artifactId>che-plugin-languageserver-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Language Server :: IDE</name>
     <properties>
         <dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
@@ -54,14 +54,29 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-core</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-languageserver-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-languageserver-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-model</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-model</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-gwt</artifactId>
@@ -155,9 +170,6 @@
     </dependencies>
     <build>
         <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
             <resource>
                 <directory>src/main/resources</directory>
             </resource>
@@ -165,12 +177,15 @@
                 <directory>${dto-generator-out-directory}</directory>
             </resource>
         </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
         <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.languageserver.LanguageServer</moduleName>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
@@ -252,7 +267,12 @@
                         <id>analyze</id>
                         <configuration>
                             <ignoredDependencies>
-                                <ignoredDependency>org.eclipse.xtext:org.eclipse.xtext.xbase.lib.gwt</ignoredDependency>
+                                <dep>org.eclipse.xtext:org.eclipse.xtext.xbase.lib.gwt</dep>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.core:che-core-api-core</dep>
+                                <dep>org.eclipse.che.core:che-core-api-languageserver-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-model</dep>
                             </ignoredDependencies>
                         </configuration>
                     </execution>
diff --git a/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/main/module.gwt.xml b/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/main/module.gwt.xml
new file mode 100644
index 0000000000..882a72c10a
--- /dev/null
+++ b/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/main/module.gwt.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2017 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
+<module>
+    <inherits name="org.eclipse.che.api.project.Project"/>
+    <inherits name="org.eclipse.lsp4j.Lsp4j"/>
+    <inherits name="org.eclipse.che.api.promises.Promises"/>
+    <inherits name="org.eclipse.che.api.languageserver.LanguageServer"/>
+    <source path="ide"/>
+</module>
diff --git a/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/main/resources/org/eclipse/che/plugin/languageserver/LanguageServer.gwt.xml b/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/main/resources/org/eclipse/che/plugin/languageserver/LanguageServer.gwt.xml
deleted file mode 100644
index 7d0916887b..0000000000
--- a/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/main/resources/org/eclipse/che/plugin/languageserver/LanguageServer.gwt.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name='org.eclipse.che.ide.ui.CodenvyUI'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.api.project.Project"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-    <inherits name="org.eclipse.lsp4j.Lsp4j"/>
-    <inherits name="org.eclipse.che.ide.editor.orion.OrionEditor"/>
-    <inherits name="org.eclipse.che.api.promises.Promises"/>
-    <inherits name="org.eclipse.che.api.languageserver.LanguageServer"/>
-    <source path=""/>
-</module>
diff --git a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml
index 549e87a5db..da75cf3dbc 100644
--- a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml
+++ b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-machine-ssh-client</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Machine :: SSH Client</name>
     <properties>
         <dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
@@ -38,6 +38,11 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-ssh-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-ssh-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>
             <artifactId>gwt-user</artifactId>
@@ -100,16 +105,31 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.ide.ext.ssh.MachineSsh</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.core:che-core-api-ssh-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/PluginsDevelopment.gwt.xml b/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/module.gwt.xml
similarity index 91%
rename from plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/PluginsDevelopment.gwt.xml
rename to plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/module.gwt.xml
index dc1f289c51..35dac6093e 100644
--- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/PluginsDevelopment.gwt.xml
+++ b/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/module.gwt.xml
@@ -17,9 +17,9 @@
     <inherits name="com.google.gwt.http.HTTP"/>
     <inherits name="com.google.gwt.i18n.I18N"/>
     <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
     <inherits name="com.google.gwt.inject.Inject"/>
+    <inherits name="org.eclipse.che.api.ssh.Ssh"/>
 
     <source path="client"/>
-    <source path="shared"/>
+    <source path="dto"/>
 </module>
diff --git a/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/resources/org/eclipse/che/ide/ext/ssh/MachineSsh.gwt.xml b/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/resources/org/eclipse/che/ide/ext/ssh/MachineSsh.gwt.xml
deleted file mode 100644
index 5a1080efb8..0000000000
--- a/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/resources/org/eclipse/che/ide/ext/ssh/MachineSsh.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.ide.ui.CodenvyUI"/>
-    <inherits name="org.eclipse.che.api.ssh.Ssh"/>
-
-    <source path="client"/>
-    <source path="dto"/>
-</module>
diff --git a/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml b/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml
index 85ff18cd96..24ed0c5c06 100644
--- a/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml
+++ b/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml
@@ -97,17 +97,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml
index 05d170502e..5009082054 100644
--- a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml
+++ b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml
@@ -19,6 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-maven-ide</artifactId>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Maven :: Extension Maven Client</name>
     <properties>
         <dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
@@ -56,6 +57,11 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-project-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-project-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-annotations</artifactId>
@@ -84,10 +90,20 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-java-ext-lang-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-java-ext-lang-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-maven-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-maven-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.vectomatic</groupId>
             <artifactId>lib-gwt-svg</artifactId>
@@ -119,21 +135,34 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.maven.Maven</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.core:che-core-api-project-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-project-shared</dep>
+                                <dep>org.eclipse.che.plugin:che-plugin-java-ext-lang-shared</dep>
+                                <dep>org.eclipse.che.plugin:che-plugin-maven-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/resources/org/eclipse/che/plugin/maven/Maven.gwt.xml b/plugins/plugin-maven/che-plugin-maven-ide/src/main/resources/org/eclipse/che/plugin/maven/Maven.gwt.xml
deleted file mode 100644
index 5987cb2ce7..0000000000
--- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/resources/org/eclipse/che/plugin/maven/Maven.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name="com.google.common.base.Base"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.ide.ext.java.Java"/>
-
-    <source path="client"/>
-    <source path="shared"/>
-</module>
diff --git a/plugins/plugin-maven/che-plugin-maven-server/pom.xml b/plugins/plugin-maven/che-plugin-maven-server/pom.xml
index 007b686332..4c823a14f5 100644
--- a/plugins/plugin-maven/che-plugin-maven-server/pom.xml
+++ b/plugins/plugin-maven/che-plugin-maven-server/pom.xml
@@ -226,27 +226,6 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/plugins/plugin-maven/che-plugin-maven-shared/pom.xml b/plugins/plugin-maven/che-plugin-maven-shared/pom.xml
index 0bbb312481..c684228cd2 100644
--- a/plugins/plugin-maven/che-plugin-maven-shared/pom.xml
+++ b/plugins/plugin-maven/che-plugin-maven-shared/pom.xml
@@ -48,17 +48,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml
index 4ea7a33f4b..768c172ef0 100644
--- a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml
+++ b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-nodejs-debugger-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: NodeJs Debugger :: IDE</name>
     <dependencies>
         <dependency>
@@ -110,15 +110,15 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
         <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.nodejsdbg.NodeJsDebugger</moduleName>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/main/module.gwt.xml b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/main/module.gwt.xml
new file mode 100644
index 0000000000..b32b29bbfe
--- /dev/null
+++ b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/main/module.gwt.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2017 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
+<module>
+    <inherits name="com.google.gwt.user.User"/>
+    <inherits name="com.google.gwt.http.HTTP"/>
+    <inherits name="com.google.gwt.i18n.I18N"/>
+    <inherits name="com.google.gwt.json.JSON"/>
+    <inherits name="com.google.gwt.inject.Inject"/>
+    <inherits name="org.eclipse.che.api.debug.Debug"/>
+
+    <source path="ide"/>
+</module>
diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/main/resources/org/eclipse/che/plugin/nodejsdbg/NodeJsDebugger.gwt.xml b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/main/resources/org/eclipse/che/plugin/nodejsdbg/NodeJsDebugger.gwt.xml
deleted file mode 100644
index db22d29be0..0000000000
--- a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/main/resources/org/eclipse/che/plugin/nodejsdbg/NodeJsDebugger.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-    <inherits name="org.eclipse.che.plugin.debugger.Debugger"/>
-    <inherits name="org.eclipse.che.api.debug.Debug"/>
-
-    <source path="ide"/>
-</module>
diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml
index e315920483..a92eab5cfc 100644
--- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml
+++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-nodejs-lang-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: NodeJs :: IDE</name>
     <dependencies>
         <dependency>
@@ -38,6 +38,11 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-nodejs-lang-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-nodejs-lang-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.vectomatic</groupId>
             <artifactId>lib-gwt-svg</artifactId>
@@ -49,13 +54,31 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.nodejs.NodeJs</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.plugin:che-plugin-nodejs-lang-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/module.gwt.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/module.gwt.xml
new file mode 100644
index 0000000000..3ae96a2c4b
--- /dev/null
+++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/module.gwt.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2017 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
+<module>
+    <inherits name="org.eclipse.che.api.project.Project"/>
+
+    <source path="ide"/>
+    <source path="shared"/>
+</module>
diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/resources/org/eclipse/che/plugin/nodejs/NodeJs.gwt.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/resources/org/eclipse/che/plugin/nodejs/NodeJs.gwt.xml
deleted file mode 100644
index 475e33505e..0000000000
--- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/resources/org/eclipse/che/plugin/nodejs/NodeJs.gwt.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name='org.eclipse.che.ide.ui.CodenvyUI'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.api.project.Project"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-
-    <source path="ide"/>
-    <source path="shared"/>
-</module>
diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml
index d28c0d38a9..65eb7db9de 100644
--- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml
+++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml
@@ -20,11 +20,4 @@
     </parent>
     <artifactId>che-plugin-nodejs-lang-shared</artifactId>
     <name>Che Plugin :: NodeJs :: Extension Shared</name>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/plugins/plugin-orion/che-plugin-orion-compare/pom.xml b/plugins/plugin-orion/che-plugin-orion-compare/pom.xml
index 8078684e09..f3f9675da9 100644
--- a/plugins/plugin-orion/che-plugin-orion-compare/pom.xml
+++ b/plugins/plugin-orion/che-plugin-orion-compare/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-orion-compare</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Orion :: Compare Widget</name>
     <properties>
         <findbugs.failonerror>false</findbugs.failonerror>
@@ -48,13 +48,15 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.ide.orion.OrionCompare</moduleName>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-orion/che-plugin-orion-compare/src/main/resources/org/eclipse/che/ide/orion/OrionCompare.gwt.xml b/plugins/plugin-orion/che-plugin-orion-compare/src/main/module.gwt.xml
similarity index 86%
rename from plugins/plugin-orion/che-plugin-orion-compare/src/main/resources/org/eclipse/che/ide/orion/OrionCompare.gwt.xml
rename to plugins/plugin-orion/che-plugin-orion-compare/src/main/module.gwt.xml
index 8aece44a63..ce398fd539 100644
--- a/plugins/plugin-orion/che-plugin-orion-compare/src/main/resources/org/eclipse/che/ide/orion/OrionCompare.gwt.xml
+++ b/plugins/plugin-orion/che-plugin-orion-compare/src/main/module.gwt.xml
@@ -13,8 +13,6 @@
 -->
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
 <module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="org.eclipse.che.ide.Api"/>
-
+    <inherits name="org.eclipse.che.Requirejs"/>
     <source path="compare"/>
 </module>
diff --git a/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml b/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml
index d09af60f56..93c8d92c84 100644
--- a/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml
+++ b/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-php-lang-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: PHP :: IDE</name>
     <dependencies>
         <dependency>
@@ -50,6 +50,11 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-php-lang-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-php-lang-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.vectomatic</groupId>
             <artifactId>lib-gwt-svg</artifactId>
@@ -61,13 +66,31 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.php.Php</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.plugin:che-plugin-php-lang-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-php/che-plugin-php-lang-ide/src/main/module.gwt.xml b/plugins/plugin-php/che-plugin-php-lang-ide/src/main/module.gwt.xml
new file mode 100644
index 0000000000..3ae96a2c4b
--- /dev/null
+++ b/plugins/plugin-php/che-plugin-php-lang-ide/src/main/module.gwt.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2017 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
+<module>
+    <inherits name="org.eclipse.che.api.project.Project"/>
+
+    <source path="ide"/>
+    <source path="shared"/>
+</module>
diff --git a/plugins/plugin-php/che-plugin-php-lang-ide/src/main/resources/org/eclipse/che/plugin/php/Php.gwt.xml b/plugins/plugin-php/che-plugin-php-lang-ide/src/main/resources/org/eclipse/che/plugin/php/Php.gwt.xml
deleted file mode 100644
index 475e33505e..0000000000
--- a/plugins/plugin-php/che-plugin-php-lang-ide/src/main/resources/org/eclipse/che/plugin/php/Php.gwt.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name='org.eclipse.che.ide.ui.CodenvyUI'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.api.project.Project"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-
-    <source path="ide"/>
-    <source path="shared"/>
-</module>
diff --git a/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml b/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml
index 2295b1c61e..90d339b04b 100644
--- a/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml
+++ b/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml
@@ -27,14 +27,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/plugins/plugin-product-info/pom.xml b/plugins/plugin-product-info/pom.xml
index c4aa3121a4..d0e39b9551 100644
--- a/plugins/plugin-product-info/pom.xml
+++ b/plugins/plugin-product-info/pom.xml
@@ -20,7 +20,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>che-plugin-product-info</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin ::  Product Info :: Client</name>
     <dependencies>
         <dependency>
@@ -54,14 +54,15 @@
         </dependency>
     </dependencies>
     <build>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.product.info.ProductInfo</moduleName>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-dashboard/che-plugin-ext-dashboard/src/main/resources/org/eclipse/che/ide/ext/dashboard/Dashboard.gwt.xml b/plugins/plugin-product-info/src/main/module.gwt.xml
similarity index 90%
rename from plugins/plugin-dashboard/che-plugin-ext-dashboard/src/main/resources/org/eclipse/che/ide/ext/dashboard/Dashboard.gwt.xml
rename to plugins/plugin-product-info/src/main/module.gwt.xml
index 4fed2709b2..e885f86b27 100644
--- a/plugins/plugin-dashboard/che-plugin-ext-dashboard/src/main/resources/org/eclipse/che/ide/ext/dashboard/Dashboard.gwt.xml
+++ b/plugins/plugin-product-info/src/main/module.gwt.xml
@@ -17,7 +17,5 @@
     <inherits name="com.google.gwt.http.HTTP"/>
     <inherits name="com.google.gwt.i18n.I18N"/>
     <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name="org.eclipse.che.ide.Api"/>
-
-    <source path="client"/>
+    <inherits name="com.google.gwt.inject.Inject"/>
 </module>
diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml
index 4de9f80763..1417763814 100644
--- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml
+++ b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml
@@ -19,6 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-pullrequest-ide</artifactId>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Pull request :: IDE</name>
     <dependencies>
         <dependency>
@@ -45,26 +46,56 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-core</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-factory-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-factory-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-git-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-git-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-model</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-model</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-ssh-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-ssh-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-workspace-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-workspace-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-annotations</artifactId>
@@ -89,6 +120,11 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-pullrequest-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-pullrequest-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.vectomatic</groupId>
             <artifactId>lib-gwt-svg</artifactId>
@@ -105,13 +141,37 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.pullrequest.PullRequest</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.core:che-core-api-factory-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-core</dep>
+                                <dep>org.eclipse.che.core:che-core-api-model</dep>
+                                <dep>org.eclipse.che.core:che-core-api-git-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-ssh-shared</dep>
+                                <dep>org.eclipse.che.core:che-core-api-workspace-shared</dep>
+                                <dep>org.eclipse.che.plugin:che-plugin-pullrequest-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml
index 94bd84fcb8..7a5cccaeb1 100644
--- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml
+++ b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml
@@ -86,14 +86,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml
index ed93452468..20ec9acdc2 100644
--- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml
+++ b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml
@@ -20,14 +20,7 @@
     </parent>
     <artifactId>che-plugin-pullrequest-shared</artifactId>
     <name>Che Plugin :: Pull request :: Shared</name>
-    <properties>
-        <dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
-    </properties>
     <dependencies>
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-dto</artifactId>
@@ -43,80 +36,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>pre-compile</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${dto-generator-out-directory}</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.che.core</groupId>
-                <artifactId>che-core-api-dto-maven-plugin</artifactId>
-                <version>${project.version}</version>
-                <!-- only need client side -->
-                <executions>
-                    <execution>
-                        <id>generate-client-dto</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                        <configuration>
-                            <dtoPackages>
-                                <package>org.eclipse.che.plugin.pullrequest.shared.dto</package>
-                            </dtoPackages>
-                            <outputDirectory>${dto-generator-out-directory}</outputDirectory>
-                            <genClassName>org.eclipse.che.plugin.pullrequest.shared.dto.DtoClientImpls</genClassName>
-                            <impl>client</impl>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <!-- this current module needs to be in the dto maven plugin dependencies so its DTO can be processed and generated -->
-                    <dependency>
-                        <groupId>${project.groupId}</groupId>
-                        <artifactId>${project.artifactId}</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml b/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml
index 960fa5bd97..7edbd57698 100644
--- a/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml
+++ b/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-python-lang-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Python :: IDE</name>
     <dependencies>
         <dependency>
@@ -50,6 +50,11 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-python-lang-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-python-lang-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.vectomatic</groupId>
             <artifactId>lib-gwt-svg</artifactId>
@@ -61,13 +66,31 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.python.Python</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.plugin:che-plugin-python-lang-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/module.gwt.xml b/plugins/plugin-python/che-plugin-python-lang-ide/src/main/module.gwt.xml
new file mode 100644
index 0000000000..3ae96a2c4b
--- /dev/null
+++ b/plugins/plugin-python/che-plugin-python-lang-ide/src/main/module.gwt.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2017 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
+<module>
+    <inherits name="org.eclipse.che.api.project.Project"/>
+
+    <source path="ide"/>
+    <source path="shared"/>
+</module>
diff --git a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/resources/org/eclipse/che/plugin/python/Python.gwt.xml b/plugins/plugin-python/che-plugin-python-lang-ide/src/main/resources/org/eclipse/che/plugin/python/Python.gwt.xml
deleted file mode 100644
index 475e33505e..0000000000
--- a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/resources/org/eclipse/che/plugin/python/Python.gwt.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name='org.eclipse.che.ide.ui.CodenvyUI'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.api.project.Project"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-
-    <source path="ide"/>
-    <source path="shared"/>
-</module>
diff --git a/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml b/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml
index 847ecd8d84..6107e47b34 100644
--- a/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml
+++ b/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml
@@ -20,11 +20,4 @@
     </parent>
     <artifactId>che-plugin-python-lang-shared</artifactId>
     <name>che-plugin-python-lang-shared</name>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml
index e8ab6ac44b..a0fc82a9bc 100644
--- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml
+++ b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-sdk-ext-plugins</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: SDK :: Plugins Development</name>
     <dependencies>
         <dependency>
@@ -30,10 +30,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-commons-gwt</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-ide-api</artifactId>
@@ -47,47 +43,17 @@
             <artifactId>gwt-user</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <classifier>sources</classifier>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easytesting</groupId>
-            <artifactId>fest-assert</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.ide.ext.plugins.SDK</moduleName>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandType.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/GwtCheCommandType.java
similarity index 58%
rename from plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandType.java
rename to plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/GwtCheCommandType.java
index 759215109a..2f68b7dea6 100644
--- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandType.java
+++ b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/GwtCheCommandType.java
@@ -8,17 +8,17 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.plugins.client.command;
+package org.eclipse.che.ide.ext.plugins.client;
+
+import static java.util.Collections.emptyList;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import java.util.LinkedList;
 import java.util.List;
 import org.eclipse.che.ide.api.command.CommandPage;
 import org.eclipse.che.ide.api.command.CommandType;
 import org.eclipse.che.ide.api.icon.Icon;
 import org.eclipse.che.ide.api.icon.IconRegistry;
-import org.eclipse.che.ide.ext.plugins.client.PluginsResources;
 
 /**
  * 'GWT SDM for Che' command type.
@@ -28,25 +28,12 @@ import org.eclipse.che.ide.ext.plugins.client.PluginsResources;
 @Singleton
 public class GwtCheCommandType implements CommandType {
 
-  public static final String CODE_SERVER_FQN = "com.google.gwt.dev.codeserver.CodeServer";
-  public static final String COMMAND_TEMPLATE =
-      "java -classpath $CHE_CLASSPATH "
-          + CODE_SERVER_FQN
-          + " $GWT_MODULE -noincremental -noprecompile";
-
+  private static final String COMMAND_TEMPLATE =
+      "mvn -f /projects/che gwt:codeserver -pl :che-ide-gwt-app -am -Pfast";
   private static final String ID = "gwt_sdm_che";
-  private static final String IDE_GWT_MODULE = "org.eclipse.che.ide.IDE";
-
-  private final PluginsResources resources;
-
-  private final List<CommandPage> pages;
 
   @Inject
-  public GwtCheCommandType(
-      PluginsResources resources, GwtCheCommandPagePresenter page, IconRegistry iconRegistry) {
-    this.resources = resources;
-    pages = new LinkedList<>();
-    pages.add(page);
+  public GwtCheCommandType(PluginsResources resources, IconRegistry iconRegistry) {
 
     iconRegistry.registerIcon(new Icon("command.type." + ID, resources.gwtCheCommandType()));
   }
@@ -68,15 +55,12 @@ public class GwtCheCommandType implements CommandType {
 
   @Override
   public List<CommandPage> getPages() {
-    return pages;
+    return emptyList();
   }
 
   @Override
   public String getCommandLineTemplate() {
-    return COMMAND_TEMPLATE
-            .replace("$GWT_MODULE", IDE_GWT_MODULE)
-            .replace("$CHE_CLASSPATH", '"' + resources.cheClassPath().getText() + '"')
-        + " -bindAddress 0.0.0.0";
+    return COMMAND_TEMPLATE;
   }
 
   @Override
diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsGinModule.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsGinModule.java
index 7173a80c6b..ef9b1589e8 100644
--- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsGinModule.java
+++ b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsGinModule.java
@@ -14,7 +14,6 @@ import com.google.gwt.inject.client.AbstractGinModule;
 import com.google.gwt.inject.client.multibindings.GinMultibinder;
 import org.eclipse.che.ide.api.command.CommandType;
 import org.eclipse.che.ide.api.extension.ExtensionGinModule;
-import org.eclipse.che.ide.ext.plugins.client.command.GwtCheCommandType;
 
 /**
  * GIN module for 'Che Plugins Development' extension.
diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsLocalizationConstant.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsLocalizationConstant.java
deleted file mode 100644
index f2bfecdf9f..0000000000
--- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsLocalizationConstant.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2012-2017 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Red Hat, Inc. - initial API and implementation
- */
-package org.eclipse.che.ide.ext.plugins.client;
-
-import com.google.gwt.i18n.client.Messages;
-
-/**
- * Localization constants. Interface represents the constants contained in resource bundle:
- * 'PluginsLocalizationConstant.properties'.
- *
- * @author Artem Zatsarynnyi
- */
-public interface PluginsLocalizationConstant extends Messages {
-
-  /* GwtCheCommandPageView */
-  @Key("view.gwtCheCommandPage.gwtModule.text")
-  String gwtCheCommandPageViewGwtModuleText();
-
-  @Key("view.gwtCheCommandPage.codeServerAddress.text")
-  String gwtCommandPageViewCodeServerAddressText();
-
-  @Key("view.gwtCheCommandPage.classPath.text")
-  String gwtCommandPageViewClassPathText();
-
-  @Key("view.gwtCheCommandPage.warn")
-  String gwtCommandPageViewWarning();
-}
diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsResources.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsResources.java
index 92c4db2db9..f6d4382592 100644
--- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsResources.java
+++ b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/PluginsResources.java
@@ -11,7 +11,6 @@
 package org.eclipse.che.ide.ext.plugins.client;
 
 import com.google.gwt.resources.client.ClientBundle;
-import com.google.gwt.resources.client.TextResource;
 import org.vectomatic.dom.svg.ui.SVGResource;
 
 /**
@@ -23,7 +22,4 @@ public interface PluginsResources extends ClientBundle {
 
   @Source("images/gwt-che-command-type.svg")
   SVGResource gwtCheCommandType();
-
-  @Source("cheClassPath.txt")
-  TextResource cheClassPath();
 }
diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandModel.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandModel.java
deleted file mode 100644
index 2c6aef615d..0000000000
--- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandModel.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2012-2017 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Red Hat, Inc. - initial API and implementation
- */
-package org.eclipse.che.ide.ext.plugins.client.command;
-
-import static org.eclipse.che.ide.ext.plugins.client.command.GwtCheCommandType.CODE_SERVER_FQN;
-import static org.eclipse.che.ide.ext.plugins.client.command.GwtCheCommandType.COMMAND_TEMPLATE;
-
-import org.eclipse.che.ide.CommandLine;
-
-/**
- * Model of the 'GWT SDM for Che' command.
- *
- * @author Artem Zatsarynnyi
- */
-class GwtCheCommandModel {
-
-  private String gwtModule;
-  private String codeServerAddress;
-  private String classPath;
-
-  GwtCheCommandModel(String gwtModule, String codeServerAddress, String classPath) {
-    this.gwtModule = gwtModule;
-    this.codeServerAddress = codeServerAddress;
-    this.classPath = classPath;
-  }
-
-  /** Crates {@link GwtCheCommandModel} instance from the given command line. */
-  static GwtCheCommandModel fromCommandLine(String commandLine) {
-    final CommandLine cmd = new CommandLine(commandLine);
-
-    final String classPathArgument = cmd.getArgument(2);
-    // remove quotes
-    final String classPath = classPathArgument.substring(1, classPathArgument.length() - 1);
-
-    final int gwtModuleArgumentIndex = cmd.indexOf(CODE_SERVER_FQN) + 1;
-    final String gwtModule = cmd.getArgument(gwtModuleArgumentIndex);
-
-    String codeServerAddress = null;
-
-    for (String arg : cmd.getArguments()) {
-      if (arg.equals("-bindAddress")) {
-        int bindAddressArgumentIndex = cmd.indexOf(arg) + 1;
-        codeServerAddress = cmd.getArgument(bindAddressArgumentIndex);
-      }
-    }
-
-    return new GwtCheCommandModel(gwtModule, codeServerAddress, classPath);
-  }
-
-  String getGwtModule() {
-    return gwtModule;
-  }
-
-  void setGwtModule(String gwtModule) {
-    this.gwtModule = gwtModule;
-  }
-
-  String getCodeServerAddress() {
-    return codeServerAddress;
-  }
-
-  void setCodeServerAddress(String codeServerAddress) {
-    this.codeServerAddress = codeServerAddress;
-  }
-
-  String getClassPath() {
-    return classPath;
-  }
-
-  void setClassPath(String classPath) {
-    this.classPath = classPath;
-  }
-
-  String toCommandLine() {
-    final StringBuilder cmd =
-        new StringBuilder(
-            COMMAND_TEMPLATE
-                .replace("$GWT_MODULE", gwtModule.trim())
-                .replace("$CHE_CLASSPATH", '"' + classPath + '"'));
-    if (!codeServerAddress.trim().isEmpty()) {
-      cmd.append(" -bindAddress ").append(codeServerAddress.trim());
-    }
-
-    return cmd.toString();
-  }
-}
diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPagePresenter.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPagePresenter.java
deleted file mode 100644
index 9011d457a4..0000000000
--- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPagePresenter.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2012-2017 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Red Hat, Inc. - initial API and implementation
- */
-package org.eclipse.che.ide.ext.plugins.client.command;
-
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import org.eclipse.che.ide.api.command.CommandImpl;
-import org.eclipse.che.ide.api.command.CommandPage;
-
-/**
- * Page allows to customize command of {@link GwtCheCommandType}.
- *
- * @author Artem Zatsarynnyi
- */
-@Singleton
-public class GwtCheCommandPagePresenter
-    implements GwtCheCommandPageView.ActionDelegate, CommandPage {
-
-  private final GwtCheCommandPageView view;
-
-  private CommandImpl editedCommand;
-  private GwtCheCommandModel editedCommandModel;
-
-  // initial value of the 'GWT module' parameter
-  private String gwtModuleInitial;
-  // initial value of the 'Code Server address' parameter
-  private String codeServerAddressInitial;
-  // initial value of the 'Classpath' parameter
-  private String classPathInitial;
-
-  private DirtyStateListener listener;
-
-  @Inject
-  public GwtCheCommandPagePresenter(GwtCheCommandPageView view) {
-    this.view = view;
-
-    view.setDelegate(this);
-  }
-
-  @Override
-  public void resetFrom(CommandImpl command) {
-    editedCommand = command;
-
-    editedCommandModel = GwtCheCommandModel.fromCommandLine(command.getCommandLine());
-
-    gwtModuleInitial = editedCommandModel.getGwtModule();
-    codeServerAddressInitial = editedCommandModel.getCodeServerAddress();
-    classPathInitial = editedCommandModel.getClassPath();
-  }
-
-  @Override
-  public void go(AcceptsOneWidget container) {
-    container.setWidget(view);
-
-    view.setGwtModule(editedCommandModel.getGwtModule());
-    view.setCodeServerAddress(editedCommandModel.getCodeServerAddress());
-    view.setClassPath(editedCommandModel.getClassPath());
-  }
-
-  @Override
-  public void onSave() {
-    gwtModuleInitial = editedCommandModel.getGwtModule();
-    codeServerAddressInitial = editedCommandModel.getCodeServerAddress();
-    classPathInitial = editedCommandModel.getClassPath();
-  }
-
-  @Override
-  public boolean isDirty() {
-    return !(gwtModuleInitial.equals(editedCommandModel.getGwtModule())
-        && codeServerAddressInitial.equals(editedCommandModel.getCodeServerAddress())
-        && classPathInitial.equals(editedCommandModel.getClassPath()));
-  }
-
-  @Override
-  public void setDirtyStateListener(DirtyStateListener listener) {
-    this.listener = listener;
-  }
-
-  @Override
-  public void setFieldStateActionDelegate(FieldStateActionDelegate delegate) {}
-
-  @Override
-  public void onGwtModuleChanged() {
-    editedCommandModel.setGwtModule(view.getGwtModule());
-
-    editedCommand.setCommandLine(editedCommandModel.toCommandLine());
-    listener.onDirtyStateChanged();
-  }
-
-  @Override
-  public void onCodeServerAddressChanged() {
-    editedCommandModel.setCodeServerAddress(view.getCodeServerAddress());
-
-    editedCommand.setCommandLine(editedCommandModel.toCommandLine());
-    listener.onDirtyStateChanged();
-  }
-
-  @Override
-  public void onClassPathChanged() {
-    editedCommandModel.setClassPath(view.getClassPath());
-
-    editedCommand.setCommandLine(editedCommandModel.toCommandLine());
-    listener.onDirtyStateChanged();
-  }
-}
diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageView.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageView.java
deleted file mode 100644
index f0947ddb13..0000000000
--- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageView.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2012-2017 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Red Hat, Inc. - initial API and implementation
- */
-package org.eclipse.che.ide.ext.plugins.client.command;
-
-import com.google.inject.ImplementedBy;
-import org.eclipse.che.ide.api.mvp.View;
-
-/**
- * The view of {@link GwtCheCommandPagePresenter}.
- *
- * @author Artem Zatsarynnyi
- */
-@ImplementedBy(GwtCheCommandPageViewImpl.class)
-public interface GwtCheCommandPageView extends View<GwtCheCommandPageView.ActionDelegate> {
-
-  /** Returns GWT module name. */
-  String getGwtModule();
-
-  /** Sets GWT module name. */
-  void setGwtModule(String gwtModule);
-
-  /** Returns GWT code server address. */
-  String getCodeServerAddress();
-
-  /** Sets GWT code server address. */
-  void setCodeServerAddress(String codeServerAddress);
-
-  /** Returns Che classpath. */
-  String getClassPath();
-
-  /** Sets Che classpath. */
-  void setClassPath(String classPath);
-
-  /** Action handler for the view actions/controls. */
-  interface ActionDelegate {
-
-    /** Called when GWT module has been changed. */
-    void onGwtModuleChanged();
-
-    /** Called when GWT code server address has been changed. */
-    void onCodeServerAddressChanged();
-
-    /** Called when classpath has been changed. */
-    void onClassPathChanged();
-  }
-}
diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageViewImpl.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageViewImpl.java
deleted file mode 100644
index 101fac1a79..0000000000
--- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageViewImpl.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2012-2017 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Red Hat, Inc. - initial API and implementation
- */
-package org.eclipse.che.ide.ext.plugins.client.command;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.dom.client.KeyUpEvent;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.uibinder.client.UiHandler;
-import com.google.gwt.user.client.Timer;
-import com.google.gwt.user.client.ui.FlowPanel;
-import com.google.gwt.user.client.ui.TextArea;
-import com.google.gwt.user.client.ui.TextBox;
-import com.google.gwt.user.client.ui.Widget;
-import com.google.inject.Inject;
-import org.eclipse.che.ide.ext.plugins.client.PluginsLocalizationConstant;
-
-/**
- * The implementation of {@link GwtCheCommandPageView}.
- *
- * @author Artem Zatsarynnyi
- */
-public class GwtCheCommandPageViewImpl implements GwtCheCommandPageView {
-
-  private static final CommandPageViewImplUiBinder UI_BINDER =
-      GWT.create(CommandPageViewImplUiBinder.class);
-
-  private final FlowPanel rootElement;
-
-  @UiField TextBox gwtModule;
-  @UiField TextBox codeServerAddress;
-  @UiField TextArea classPath;
-
-  @UiField(provided = true)
-  PluginsLocalizationConstant locale;
-
-  private ActionDelegate delegate;
-
-  @Inject
-  public GwtCheCommandPageViewImpl(PluginsLocalizationConstant locale) {
-    this.locale = locale;
-    rootElement = UI_BINDER.createAndBindUi(this);
-  }
-
-  @Override
-  public void setDelegate(ActionDelegate delegate) {
-    this.delegate = delegate;
-  }
-
-  @Override
-  public Widget asWidget() {
-    return rootElement;
-  }
-
-  @Override
-  public String getGwtModule() {
-    return gwtModule.getValue();
-  }
-
-  @Override
-  public void setGwtModule(String gwtModule) {
-    this.gwtModule.setValue(gwtModule);
-  }
-
-  @Override
-  public String getCodeServerAddress() {
-    return codeServerAddress.getValue();
-  }
-
-  @Override
-  public void setCodeServerAddress(String codeServerAddress) {
-    this.codeServerAddress.setValue(codeServerAddress);
-  }
-
-  @Override
-  public String getClassPath() {
-    return classPath.getValue();
-  }
-
-  @Override
-  public void setClassPath(String classPath) {
-    this.classPath.setValue(classPath);
-  }
-
-  @UiHandler({"gwtModule"})
-  void onGwtModuleChanged(KeyUpEvent event) {
-    // gwtModule value may not be updated immediately after keyUp
-    // therefore use the timer with delay=0
-    new Timer() {
-      @Override
-      public void run() {
-        delegate.onGwtModuleChanged();
-      }
-    }.schedule(0);
-  }
-
-  @UiHandler({"codeServerAddress"})
-  void onCodeServerAddressChanged(KeyUpEvent event) {
-    // codeServerAddress value may not be updated immediately after keyUp
-    // therefore use the timer with delay=0
-    new Timer() {
-      @Override
-      public void run() {
-        delegate.onCodeServerAddressChanged();
-      }
-    }.schedule(0);
-  }
-
-  @UiHandler({"classPath"})
-  void onClassPathChanged(KeyUpEvent event) {
-    // classPath value may not be updated immediately after keyUp
-    // therefore use the timer with delay=0
-    new Timer() {
-      @Override
-      public void run() {
-        delegate.onClassPathChanged();
-      }
-    }.schedule(0);
-  }
-
-  interface CommandPageViewImplUiBinder extends UiBinder<FlowPanel, GwtCheCommandPageViewImpl> {}
-}
diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageViewImpl.ui.xml b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageViewImpl.ui.xml
deleted file mode 100644
index 25123462ad..0000000000
--- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java/org/eclipse/che/ide/ext/plugins/client/command/GwtCheCommandPageViewImpl.ui.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
-             xmlns:g='urn:import:com.google.gwt.user.client.ui'>
-    <ui:with field='locale' type='org.eclipse.che.ide.ext.plugins.client.PluginsLocalizationConstant'/>
-    <ui:style>
-        .inputField {
-            color: #dbdbdb;
-            border: 1px solid #191c1e;
-            border-radius: 1px;
-            box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.19) inset, 0px 1px 0px 0px rgba(223, 223, 223, 0.4);
-            font-size: 12px;
-            padding-left: 8px;
-            height: 70px;
-        }
-
-        .label {
-            position: relative;
-            line-height: 29px;
-        }
-
-        .mainPanel {
-            margin: 15px;
-        }
-
-        .floatLeft {
-            float: left;
-        }
-
-        .floatRight {
-            float: right;
-        }
-
-        .marginBottom {
-            margin-bottom: 7px !important;
-        }
-
-        .warning {
-            color: orange;
-        }
-    </ui:style>
-
-    <g:FlowPanel debugId="gwtChePageView-mainPanel" addStyleNames="{style.mainPanel}">
-        <g:Label text="{locale.gwtCommandPageViewWarning}" addStyleNames="{style.warning}"/>
-        <g:FlowPanel height="50px">
-            <g:Label text="{locale.gwtCheCommandPageViewGwtModuleText}"
-                     addStyleNames="{style.label} {style.floatLeft}"/>
-            <g:TextBox width="100%" ui:field="gwtModule" debugId="gwtChePageView-gwtModule"
-                       addStyleNames="{style.inputField} {style.floatRight} {style.marginBottom}"/>
-        </g:FlowPanel>
-        <g:FlowPanel height="50px">
-            <g:Label text="{locale.gwtCommandPageViewCodeServerAddressText}"
-                     addStyleNames="{style.label} {style.floatLeft}"/>
-            <g:TextBox width="100%" ui:field="codeServerAddress" debugId="gwtChePageView-codeServerAddress"
-                       addStyleNames="{style.inputField} {style.floatRight}"/>
-        </g:FlowPanel>
-        <g:FlowPanel height="105px">
-            <g:Label text="{locale.gwtCommandPageViewClassPathText}"
-                     addStyleNames="{style.label} {style.floatLeft}"/>
-            <g:TextArea width="100%" ui:field="classPath" debugId="gwtChePageView-classPath"
-                        addStyleNames="{style.inputField} {style.floatRight}"/>
-        </g:FlowPanel>
-    </g:FlowPanel>
-</ui:UiBinder>
diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/client/PluginsLocalizationConstant.properties b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/client/PluginsLocalizationConstant.properties
deleted file mode 100644
index ddec25fa55..0000000000
--- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/client/PluginsLocalizationConstant.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (c) 2012-2017 Red Hat, Inc.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#   Red Hat, Inc. - initial API and implementation
-#
-
-##### GwtCheCommandPageView #####
-view.gwtCheCommandPage.gwtModule.text = GWT module
-view.gwtCheCommandPage.codeServerAddress.text = Code server address
-view.gwtCheCommandPage.classPath.text = Class path
-view.gwtCheCommandPage.warn = NOTE: CHE project have to be built first
diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/client/cheClassPath.txt b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/client/cheClassPath.txt
deleted file mode 100644
index 80bd2070d1..0000000000
--- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources/org/eclipse/che/ide/ext/plugins/client/cheClassPath.txt
+++ /dev/null
@@ -1,304 +0,0 @@
-/home/user/.m2/repository/com/google/gwt/gwt-codeserver/2.7.0/gwt-codeserver-2.7.0.jar:\
-/home/user/.m2/repository/com/google/gwt/gwt-dev/2.7.0/gwt-dev-2.7.0.jar:\
-/projects/che/assembly-ide-war/src/main/java:\
-/projects/che/assembly-ide-war/src/main/resources:\
-/projects/che/assembly-ide-war/target/generated-sources/gen:\
-/projects/che-core/platform-api/che-core-api-account/src/main/java:\
-/projects/che-core/platform-api/che-core-api-account/target/generated-sources/dto:\
-/projects/che-core/platform-api/che-core-api-dto/src/main/java:\
-/projects/che-core/platform-api/che-core-api-model/src/main/java:\
-/projects/che-core/platform-api/che-core-api-model/src/main/resources:\
-/projects/che-core/commons/che-core-commons-annotations/src/main/java:\
-/projects/che-core/commons/che-core-commons-lang/src/main/java:\
-/projects/che-core/platform-api/che-core-api-auth/src/main/java:\
-/projects/che-core/platform-api/che-core-api-auth/src/main/resources:\
-/projects/che-core/platform-api/che-core-api-auth/target/generated-sources/dto:\
-/projects/che-core/commons/che-core-commons-env/src/main/java:\
-/projects/che-core/commons/che-core-commons-json/src/main/java:\
-/projects/che-core/platform-api/che-core-api-core/src/main/java:\
-/projects/che-core/platform-api/che-core-api-core/src/main/resources:\
-/projects/che-core/platform-api/che-core-api-core/target/generated-sources/dto:\
-/projects/che-core/platform-api/che-core-api-infrastructure-local/src/main/java:\
-/projects/che-core/platform-api/che-core-api-machine/src/main/java:\
-/projects/che-core/platform-api/che-core-api-machine/target/generated-sources/dto:\
-/projects/che-core/platform-api/che-core-api-project/src/main/java:\
-/projects/che-core/platform-api/che-core-api-project/target/generated-sources/dto:\
-/projects/che-core/platform-api/che-core-api-ssh/src/main/java:\
-/projects/che-core/platform-api/che-core-api-ssh/target/generated-sources/dto:\
-/projects/che-core/platform-api/che-core-api-user/src/main/java:\
-/projects/che-core/platform-api/che-core-api-user/target/generated-sources/dto:\
-/projects/che-core/platform-api/che-core-api-vfs/src/main/java:\
-/projects/che-core/platform-api/che-core-api-vfs/src/main/resources:\
-/projects/che-core/platform-api/che-core-api-vfs/target/generated-sources/dto:\
-/projects/che-core/platform-api/che-core-api-workspace/src/main/java:\
-/projects/che-core/platform-api/che-core-api-workspace/target/generated-sources/dto:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-account/src/main/java:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-account/src/main/resources:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-account/target/generated-sources/dto:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/java:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/resources:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-auth/target/generated-sources/dto:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-core/src/main/resources:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-core/target/generated-sources/dto:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/java:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/resources:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-factory/target/generated-sources/dto:\
-/projects/che-core/platform-api/che-core-api-factory/src/main/java:\
-/projects/che-core/platform-api/che-core-api-factory/target/generated-sources/dto:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-git/src/main/java:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-git/src/main/resources:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-git/target/generated-sources/dto:\
-/projects/che-core/platform-api/che-core-api-git/src/main/java:\
-/projects/che-core/platform-api/che-core-api-git/target/generated-sources/dto:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/resources:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-machine/target/generated-sources/dto:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-project/src/main/resources:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-project/target/generated-sources/dto:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/java:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/resources:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-ssh/target/generated-sources/dto:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-user/src/main/resources:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-user/target/generated-sources/dto:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-vfs/src/main/java:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-vfs/src/main/resources:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-vfs/target/generated-sources/dto:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/resources:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-workspace/target/generated-sources/dto:\
-/projects/che-core/commons/che-core-commons-gwt/src/main/java:\
-/projects/che-core/commons/che-core-commons-gwt/src/main/resources:\
-/projects/che-core/commons/che-core-commons-inject/src/main/java:\
-/projects/che-core/commons/che-core-commons-inject/src/main/resources:\
-/projects/che-core/ide/che-core-ide-api/src/main/java:\
-/projects/che-core/ide/che-core-ide-api/src/main/resources:\
-/projects/che-core/ide/che-core-ide-api/target/generated-sources/gen:\
-/projects/che-core/ide/che-core-ide-app/src/main/java:\
-/projects/che-core/ide/che-core-ide-app/src/main/resources:\
-/projects/che-core/ide/che-core-ide-app/target/generated-sources/dto:\
-/projects/che-core/ide/che-core-ide-app/target/generated-sources/gen:\
-/projects/che-core/ide/che-core-ide-generators/src/main/java:\
-/projects/che-core/ide/che-core-ide-ui/src/main/java:\
-/projects/che-core/ide/che-core-ide-ui/src/main/resources:\
-/projects/che-core/ide/che-core-ide-jseditor/src/main/java:\
-/projects/che-core/ide/che-core-ide-jseditor/src/main/resources:\
-/projects/che-core/ide/che-core-ide-jseditor/target/requirejs-2.1.15:\
-/projects/che-core/che-core-vfs-impl/src/main/java:\
-/projects/che-core/che-core-vfs-impl/src/main/resources:\
-/projects/che-plugins/plugin-dashboard/che-plugin-ext-dashboard/src/main/java:\
-/projects/che-plugins/plugin-dashboard/che-plugin-ext-dashboard/src/main/resources:\
-/projects/che-plugins/plugin-git/che-plugin-git-ext-git/src/main/java:\
-/projects/che-plugins/plugin-git/che-plugin-git-ext-git/src/main/resources:\
-/projects/che-plugins/plugin-git/che-plugin-git-ext-git/target/generated-sources/dto:\
-/projects/che-plugins/plugin-github/che-plugin-github-ext-github/src/main/java:\
-/projects/che-plugins/plugin-github/che-plugin-github-ext-github/src/main/resources:\
-/projects/che-plugins/plugin-github/che-plugin-github-ext-github/target/generated-sources/dto:\
-/projects/che-plugins/plugin-git/che-plugin-git-ssh-client/src/main/java:\
-/projects/che-plugins/plugin-git/che-plugin-git-ssh-client/src/main/resources:\
-/projects/che-plugins/plugin-github/che-plugin-github-oauth2/src/main/java:\
-/projects/che-plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/main/java:\
-/projects/che-plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/main/resources:\
-/projects/che-plugins/plugin-help/che-plugin-help-ext-client/src/main/java:\
-/projects/che-plugins/plugin-help/che-plugin-help-ext-client/src/main/resources:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-debugger-java-client/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-debugger-java-client/src/main/resources:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-debugger-java-shared/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-debugger-java-shared/target/generated-sources/dto:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-shared/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-shared/target/generated-sources/dto:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-maven/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-maven/src/main/resources:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-maven/target/generated-sources/dto:\
-/projects/che-core/commons/che-core-commons-xml/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-generator-archetype/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-generator-archetype/target/generated-sources/dto:\
-/projects/che-plugins/plugin-java/che-plugin-java-maven-tools/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/src/main/resources:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/src/main/resources:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/src/main/resources:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/src/main/resources:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/src/main/resources:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/src/main/java:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/src/main/resources:\
-/projects/che-plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java:\
-/projects/che-plugins/plugin-machine/che-plugin-machine-ext-client/src/main/resources:\
-/projects/che-plugins/plugin-machine/che-plugin-machine-ext-server/src/main/java:\
-/projects/che-plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/java:\
-/projects/che-plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/resources:\
-/projects/che-plugins/plugin-orion/che-plugin-orion-compare/src/main/java:\
-/projects/che-plugins/plugin-orion/che-plugin-orion-compare/src/main/resources:\
-/projects/che-plugins/plugin-orion/che-plugin-orion-editor/src/main/java:\
-/projects/che-plugins/plugin-orion/che-plugin-orion-editor/src/main/resources:\
-/projects/che-plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/java:\
-/projects/che-plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/main/resources:\
-/projects/che-plugins/plugin-web/che-plugin-web-ext-web/src/main/java:\
-/projects/che-plugins/plugin-web/che-plugin-web-ext-web/src/main/resources:\
-/projects/che/assembly-ide-war/target/classes:\
-/home/user/.m2/repository/com/google/guava/guava/18.0/guava-18.0.jar:\
-/home/user/.m2/repository/com/google/guava/guava-gwt/18.0/guava-gwt-18.0.jar:\
-/home/user/.m2/repository/com/google/gwt/inject/gin/2.1.2/gin-2.1.2.jar:\
-/home/user/.m2/repository/com/google/inject/guice/4.0/guice-4.0.jar:\
-/home/user/.m2/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar:\
-/home/user/.m2/repository/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar:\
-/home/user/.m2/repository/com/google/inject/extensions/guice-multibindings/4.0/guice-multibindings-4.0.jar:\
-/home/user/.m2/repository/com/google/inject/extensions/guice-servlet/4.0/guice-servlet-4.0.jar:\
-/home/user/.m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar:\
-/projects/che-core/platform-api/che-core-api-account/target/classes:\
-/home/user/.m2/repository/com/google/code/gson/gson/2.3.1/gson-2.3.1.jar:\
-/home/user/.m2/repository/io/swagger/swagger-annotations/1.5.6/swagger-annotations-1.5.6.jar:\
-/home/user/.m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar:\
-/home/user/.m2/repository/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar:\
-/projects/che-core/platform-api/che-core-api-dto/target/classes:\
-/home/user/.m2/repository/org/reflections/reflections/0.9.9/reflections-0.9.9.jar:\
-/home/user/.m2/repository/org/javassist/javassist/3.18.2-GA/javassist-3.18.2-GA.jar:\
-/projects/che-core/platform-api/che-core-api-model/target/classes:\
-/projects/che-core/commons/che-core-commons-annotations/target/classes:\
-/projects/che-core/commons/che-core-commons-lang/target/classes:\
-/home/user/.m2/repository/org/apache/commons/commons-compress/1.9/commons-compress-1.9.jar:\
-/home/user/.m2/repository/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.jar:\
-/projects/che-core/platform-api/che-core-api-auth/target/classes:\
-/home/user/.m2/repository/com/google/http-client/google-http-client/1.19.0/google-http-client-1.19.0.jar:\
-/home/user/.m2/repository/com/google/http-client/google-http-client-jackson2/1.19.0/google-http-client-jackson2-1.19.0.jar:\
-/home/user/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.5.0/jackson-core-2.5.0.jar:\
-/home/user/.m2/repository/com/google/oauth-client/google-oauth-client/1.19.0/google-oauth-client-1.19.0.jar:\
-/projects/che-core/commons/che-core-commons-env/target/classes:\
-/projects/che-core/commons/che-core-commons-json/target/classes:\
-/projects/che-core/platform-api/che-core-api-core/target/classes:\
-/home/user/.m2/repository/javax/ws/rs/javax.ws.rs-api/2.0/javax.ws.rs-api-2.0.jar:\
-/home/user/.m2/repository/net/java/dev/jna/jna/4.1.0/jna-4.1.0.jar:\
-/projects/che-core/platform-api/che-core-api-infrastructure-local/target/classes:\
-/projects/che-core/platform-api/che-core-api-machine/target/classes:\
-/projects/che-core/platform-api/che-core-api-project/target/classes:\
-/home/user/.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar:\
-/projects/che-core/platform-api/che-core-api-ssh/target/classes:\
-/home/user/.m2/repository/com/jcraft/jsch/0.1.53/jsch-0.1.53.jar:\
-/projects/che-core/platform-api/che-core-api-user/target/classes:\
-/projects/che-core/platform-api/che-core-api-vfs/target/classes:\
-/home/user/.m2/repository/commons-io/commons-io/2.4/commons-io-2.4.jar:\
-/home/user/.m2/repository/org/apache/lucene/lucene-analyzers-common/5.2.1/lucene-analyzers-common-5.2.1.jar:\
-/home/user/.m2/repository/org/apache/lucene/lucene-core/5.2.1/lucene-core-5.2.1.jar:\
-/home/user/.m2/repository/org/apache/lucene/lucene-queryparser/5.2.1/lucene-queryparser-5.2.1.jar:\
-/home/user/.m2/repository/org/apache/lucene/lucene-queries/5.2.1/lucene-queries-5.2.1.jar:\
-/home/user/.m2/repository/org/apache/lucene/lucene-sandbox/5.2.1/lucene-sandbox-5.2.1.jar:\
-/home/user/.m2/repository/org/apache/tika/tika-core/1.11/tika-core-1.11.jar:\
-/projects/che-core/platform-api/che-core-api-workspace/target/classes:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-account/target/classes:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-auth/target/classes:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-core/target/classes:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-factory/target/classes:\
-/projects/che-core/platform-api/che-core-api-factory/target/classes:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-git/target/classes:\
-/projects/che-core/platform-api/che-core-api-git/target/classes:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-machine/target/classes:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-project/target/classes:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-ssh/target/classes:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-user/target/classes:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-vfs/target/classes:\
-/projects/che-core/platform-api-client-gwt/che-core-client-gwt-workspace/target/classes:\
-/projects/che-core/commons/che-core-commons-gwt/target/classes:\
-/home/user/.m2/repository/com/google/gwt/gwt-elemental/2.7.0/gwt-elemental-2.7.0.jar:\
-/home/user/.m2/repository/org/vectomatic/lib-gwt-svg/0.5.10/lib-gwt-svg-0.5.10.jar:\
-/projects/che-core/commons/che-core-commons-inject/target/classes:\
-/projects/che-core/ide/che-core-ide-api/target/classes:\
-/projects/che-core/ide/che-core-ide-app/target/che-core-ide-app-4.0.0-beta-12-SNAPSHOT/WEB-INF/classes:\
-/projects/che-core/ide/che-core-ide-generators/target/classes:\
-/projects/che-core/ide/che-core-ide-ui/target/classes:\
-/projects/che-core/ide/che-core-ide-jseditor/target/classes:\
-/projects/che-core/che-core-vfs-impl/target/classes:\
-/home/user/.m2/repository/commons-codec/commons-codec/1.10/commons-codec-1.10.jar:\
-/home/user/.m2/repository/org/bouncycastle/bcpkix-jdk15on/1.51/bcpkix-jdk15on-1.51.jar:\
-/home/user/.m2/repository/org/bouncycastle/bcprov-jdk15on/1.51/bcprov-jdk15on-1.51.jar:\
-/projects/che-plugins/plugin-dashboard/che-plugin-ext-dashboard/target/classes:\
-/projects/che-plugins/plugin-git/che-plugin-git-ext-git/target/classes:\
-/projects/che-plugins/plugin-github/che-plugin-github-ext-github/target/classes:\
-/projects/che-plugins/plugin-git/che-plugin-git-ssh-client/target/classes:\
-/home/user/.m2/repository/org/kohsuke/github-api/1.67/github-api-1.67.jar:\
-/home/user/.m2/repository/commons-lang/commons-lang/2.6/commons-lang-2.6.jar:\
-/home/user/.m2/repository/com/infradna/tool/bridge-method-annotation/1.14/bridge-method-annotation-1.14.jar:\
-/home/user/.m2/repository/org/jenkins-ci/annotation-indexer/1.4/annotation-indexer-1.4.jar:\
-/projects/che-plugins/plugin-github/che-plugin-github-oauth2/target/classes:\
-/home/user/.m2/repository/javax/mail/mail/1.4.4/mail-1.4.4.jar:\
-/home/user/.m2/repository/javax/activation/activation/1.1/activation-1.1.jar:\
-/projects/che-plugins/plugin-gwt/che-plugin-gwt-ext-gwt/target/classes:\
-/projects/che-plugins/plugin-help/che-plugin-help-ext-client/target/classes:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-debugger-java-client/target/classes:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-debugger-java-shared/target/classes:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-client/target/classes:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-server/target/classes:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-lang-shared/target/classes:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-maven/target/classes:\
-/home/user/.m2/repository/org/eclipse/birt/runtime/org.eclipse.equinox.common/3.6.200.v20130402-1505/org.eclipse.equinox.common-3.6.200.v20130402-1505.jar:\
-/projects/che-core/commons/che-core-commons-xml/target/classes:\
-/projects/che-plugins/plugin-java/che-plugin-java-generator-archetype/target/classes:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/che-plugin-java-jdt-core-repack/target/classes:\
-/projects/che-plugins/plugin-java/che-plugin-java-maven-tools/target/classes:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/target/classes:\
-/home/user/.m2/repository/org/eclipse/birt/runtime/org.eclipse.core.jobs/3.6.0.v20140424-0053/org.eclipse.core.jobs-3.6.0.v20140424-0053.jar:\
-/home/user/.m2/repository/org/eclipse/birt/runtime/org.eclipse.core.runtime/3.10.0.v20140318-2214/org.eclipse.core.runtime-3.10.0.v20140318-2214.jar:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/target/classes:\
-/home/user/.m2/repository/ch/qos/logback/logback-classic/1.1.2/logback-classic-1.1.2.jar:\
-/home/user/.m2/repository/ch/qos/logback/logback-core/1.1.2/logback-core-1.1.2.jar:\
-/home/user/.m2/repository/org/eclipse/core/contenttype/3.4.200-v20140207-1251/contenttype-3.4.200-v20140207-1251.jar:\
-/home/user/.m2/repository/org/eclipse/core/org.eclipse.core.commands/3.6.0/org.eclipse.core.commands-3.6.0.jar:\
-/home/user/.m2/repository/org/eclipse/equinox/preferences/3.5.200-v20140224-1527/preferences-3.5.200-v20140224-1527.jar:\
-/home/user/.m2/repository/org/eclipse/equinox/common/3.6.200-v20130402-1505/common-3.6.200-v20130402-1505.jar:\
-/home/user/.m2/repository/org/eclipse/tycho/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi-3.10.0.v20140606-1445.jar:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/target/classes:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/target/classes:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/target/classes:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/target/classes:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/target/classes:\
-/home/user/.m2/repository/org/mod4j/org/eclipse/core/expressions/3.4.100/expressions-3.4.100.jar:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/target/classes:\
-/projects/che-plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/target/classes:\
-/home/user/.m2/repository/org/eclipse/equinox/registry/3.5.400-v20140428-1507/registry-3.5.400-v20140428-1507.jar:\
-/home/user/.m2/repository/org/eclipse/search/org.eclipse.search/3.10.0.v20150318-0856/org.eclipse.search-3.10.0.v20150318-0856.jar:\
-/home/user/.m2/repository/org/eclipse/text/org.eclipse.text/3.5.101/org.eclipse.text-3.5.101.jar:\
-/home/user/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.common/3.6.0/org.eclipse.equinox.common-3.6.0.jar:\
-/projects/che-plugins/plugin-machine/che-plugin-machine-ext-client/target/classes:\
-/projects/che-plugins/plugin-machine/che-plugin-machine-ext-server/target/classes:\
-/projects/che-plugins/plugin-machine/che-plugin-machine-ssh-client/target/classes:\
-/projects/che-plugins/plugin-orion/che-plugin-orion-compare/target/classes:\
-/projects/che-plugins/plugin-orion/che-plugin-orion-editor/target/classes:\
-/projects/che-plugins/plugin-sdk/che-plugin-sdk-ext-plugins/target/classes:\
-/projects/che-plugins/plugin-web/che-plugin-web-ext-web/target/classes:\
-/home/user/.m2/repository/org/eclipse/che/swagger/che-swagger-module/4.0.0-beta-12-SNAPSHOT/che-swagger-module-4.0.0-beta-12-20160117.063216-1.jar:\
-/home/user/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.5.0/jackson-databind-2.5.0.jar:\
-/home/user/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.5.0/jackson-annotations-2.5.0.jar:\
-/home/user/.m2/repository/io/swagger/swagger-core/1.5.6/swagger-core-1.5.6.jar:\
-/home/user/.m2/repository/com/fasterxml/jackson/datatype/jackson-datatype-joda/2.4.5/jackson-datatype-joda-2.4.5.jar:\
-/home/user/.m2/repository/joda-time/joda-time/2.2/joda-time-2.2.jar:\
-/home/user/.m2/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.4.5/jackson-dataformat-yaml-2.4.5.jar:\
-/home/user/.m2/repository/org/yaml/snakeyaml/1.12/snakeyaml-1.12.jar:\
-/home/user/.m2/repository/io/swagger/swagger-jaxrs/1.5.6/swagger-jaxrs-1.5.6.jar:\
-/home/user/.m2/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.4.5/jackson-dataformat-xml-2.4.5.jar:\
-/home/user/.m2/repository/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.5/jackson-module-jaxb-annotations-2.4.5.jar:\
-/home/user/.m2/repository/org/codehaus/woodstox/stax2-api/3.1.4/stax2-api-3.1.4.jar:\
-/home/user/.m2/repository/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.4.5/jackson-jaxrs-json-provider-2.4.5.jar:\
-/home/user/.m2/repository/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.4.5/jackson-jaxrs-base-2.4.5.jar:\
-/home/user/.m2/repository/io/swagger/swagger-models/1.5.6/swagger-models-1.5.6.jar:\
-/home/user/.m2/repository/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar:\
-/home/user/.m2/repository/org/everrest/everrest-core/1.10.0/everrest-core-1.10.0.jar:\
-/home/user/.m2/repository/org/everrest/everrest-integration-guice/1.10.0/everrest-integration-guice-1.10.0.jar:\
-/home/user/.m2/repository/org/everrest/everrest-websockets/1.10.0/everrest-websockets-1.10.0.jar:\
-/home/user/.m2/repository/com/google/gwt/gwt-user/2.7.0/gwt-user-2.7.0.jar:\
-/home/user/.m2/repository/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar:\
-/home/user/.m2/repository/com/google/gwt/gwt-servlet/2.7.0/gwt-servlet-2.7.0.jar:\
-/home/user/.m2/repository/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar:\
-/home/user/.m2/repository/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar:\
-/home/user/.m2/repository/org/ow2/asm/asm-util/5.0.3/asm-util-5.0.3.jar:\
-/home/user/.m2/repository/org/ow2/asm/asm-commons/5.0.3/asm-commons-5.0.3.jar:\
-/home/user/.m2/repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.jar
diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/test/java/org/eclipse/che/ide/ext/plugins/client/command/GwtChePagePresenterTest.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/test/java/org/eclipse/che/ide/ext/plugins/client/command/GwtChePagePresenterTest.java
deleted file mode 100644
index 1a5a44ec2c..0000000000
--- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/test/java/org/eclipse/che/ide/ext/plugins/client/command/GwtChePagePresenterTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2012-2017 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Red Hat, Inc. - initial API and implementation
- */
-package org.eclipse.che.ide.ext.plugins.client.command;
-
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import org.eclipse.che.ide.api.command.CommandImpl;
-import org.eclipse.che.ide.api.command.CommandPage;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-
-/** @author Artem Zatsarynnyi */
-@RunWith(MockitoJUnitRunner.class)
-public class GwtChePagePresenterTest {
-
-  private static final String GWT_MODULE = "org.eclipse.CHE";
-  private static final String CODE_SERVER_ADDRESS = "0.0.0.0";
-  private static final String CHE_CLASS_PATH = "class_path";
-  private static final String COMMAND_LINE =
-      "java -classpath \""
-          + CHE_CLASS_PATH
-          + "\" com.google.gwt.dev.codeserver.CodeServer "
-          + GWT_MODULE
-          + " -noincremental -noprecompile -bindAddress "
-          + CODE_SERVER_ADDRESS;
-
-  @Mock private GwtCheCommandPageView view;
-  @Mock private CommandImpl command;
-
-  @InjectMocks private GwtCheCommandPagePresenter presenter;
-
-  @Before
-  public void setUp() {
-    when(command.getCommandLine()).thenReturn(COMMAND_LINE);
-
-    presenter.resetFrom(command);
-  }
-
-  @Test
-  public void testResetting() throws Exception {
-    verify(command).getCommandLine();
-  }
-
-  @Test
-  public void testGo() throws Exception {
-    AcceptsOneWidget container = Mockito.mock(AcceptsOneWidget.class);
-
-    presenter.go(container);
-
-    verify(container).setWidget(eq(view));
-    verify(view).setGwtModule(eq(GWT_MODULE));
-    verify(view).setCodeServerAddress(eq(CODE_SERVER_ADDRESS));
-    verify(view).setClassPath(eq(CHE_CLASS_PATH));
-  }
-
-  @Test
-  public void testOnGwtModuleChanged() throws Exception {
-    when(view.getGwtModule()).thenReturn(GWT_MODULE);
-
-    final CommandPage.DirtyStateListener listener = mock(CommandPage.DirtyStateListener.class);
-    presenter.setDirtyStateListener(listener);
-
-    presenter.onGwtModuleChanged();
-
-    verify(view).getGwtModule();
-    verify(command).setCommandLine(eq(COMMAND_LINE));
-    verify(listener).onDirtyStateChanged();
-  }
-
-  @Test
-  public void testOnCodeServerAddressChanged() throws Exception {
-    when(view.getCodeServerAddress()).thenReturn(CODE_SERVER_ADDRESS);
-
-    final CommandPage.DirtyStateListener listener = mock(CommandPage.DirtyStateListener.class);
-    presenter.setDirtyStateListener(listener);
-
-    presenter.onCodeServerAddressChanged();
-
-    verify(view).getCodeServerAddress();
-    verify(command).setCommandLine(eq(COMMAND_LINE));
-    verify(listener).onDirtyStateChanged();
-  }
-
-  @Test
-  public void testOnClassPathChanged() throws Exception {
-    when(view.getClassPath()).thenReturn(CHE_CLASS_PATH);
-
-    final CommandPage.DirtyStateListener listener = mock(CommandPage.DirtyStateListener.class);
-    presenter.setDirtyStateListener(listener);
-
-    presenter.onClassPathChanged();
-
-    verify(view).getClassPath();
-    verify(command).setCommandLine(eq(COMMAND_LINE));
-    verify(listener).onDirtyStateChanged();
-  }
-}
diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml
index 0a447afe40..71027f2f4f 100644
--- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml
+++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml
@@ -19,6 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-testing-junit-ide</artifactId>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Java Testing :: JUnit IDE</name>
     <dependencies>
         <dependency>
@@ -37,6 +38,11 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-testing-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-testing-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-gwt</artifactId>
@@ -73,16 +79,31 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.java</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.testing.junit.JUnit</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.core:che-core-api-testing-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/JUnit.gwt.xml b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/module.gwt.xml
similarity index 74%
rename from plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/JUnit.gwt.xml
rename to plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/module.gwt.xml
index cb353782b2..6fa971dab4 100644
--- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/JUnit.gwt.xml
+++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/module.gwt.xml
@@ -12,10 +12,7 @@
 -->
 <module>
     <inherits name="com.google.gwt.user.User"/>
-    <inherits name="org.eclipse.che.ide.Api"/>
     <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.ide.ui.CodenvyUI"/>
-    <inherits name="org.eclipse.che.plugin.testing.TestingExtension"/>
 
     <source path="ide"/>
 </module>
diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml
index c2137d56f2..12385f3f3a 100644
--- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml
+++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml
@@ -19,6 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-testing-testng-ide</artifactId>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Java Testing :: TestNG IDE</name>
     <dependencies>
         <dependency>
@@ -73,16 +74,15 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.java</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.testing.testng.TestNG</moduleName>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/TestNG.gwt.xml b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/module.gwt.xml
similarity index 74%
rename from plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/TestNG.gwt.xml
rename to plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/module.gwt.xml
index cb353782b2..6fa971dab4 100644
--- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/TestNG.gwt.xml
+++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/module.gwt.xml
@@ -12,10 +12,7 @@
 -->
 <module>
     <inherits name="com.google.gwt.user.User"/>
-    <inherits name="org.eclipse.che.ide.Api"/>
     <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.ide.ui.CodenvyUI"/>
-    <inherits name="org.eclipse.che.plugin.testing.TestingExtension"/>
 
     <source path="ide"/>
 </module>
diff --git a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml
index af3a95112e..364b741c3c 100644
--- a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml
+++ b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml
@@ -19,6 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-testing-phpunit-ide</artifactId>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: PHP Testing :: PHPUnit IDE</name>
     <dependencies>
         <dependency>
@@ -61,16 +62,15 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.java</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.testing.phpunit.PHPUnit</moduleName>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/src/main/module.gwt.xml b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/src/main/module.gwt.xml
new file mode 100644
index 0000000000..d09f3217e1
--- /dev/null
+++ b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/src/main/module.gwt.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Copyright (c) 2012-2017 Red Hat, Inc.
+  ~ All rights reserved. This program and the accompanying materials
+  ~ are made available under the terms of the Eclipse Public License v1.0
+  ~ which accompanies this distribution, and is available at
+  ~ http://www.eclipse.org/legal/epl-v10.html
+  ~
+  ~ Contributors:
+  ~   Red Hat, Inc. - initial API and implementation
+  -->
+<module>
+    <inherits name="com.google.gwt.user.User"/>
+    <inherits name="com.google.gwt.inject.Inject"/>
+
+    <source path="ide"/>
+</module>
diff --git a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/src/main/resources/org/eclipse/che/plugin/testing/phpunit/PHPUnit.gwt.xml b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/src/main/resources/org/eclipse/che/plugin/testing/phpunit/PHPUnit.gwt.xml
deleted file mode 100644
index 8ce81f40a9..0000000000
--- a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/src/main/resources/org/eclipse/che/plugin/testing/phpunit/PHPUnit.gwt.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-
-    Copyright (c) 2012-2016 Rogue Wave Software, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Rogue Wave Software, Inc. - initial API and implementation
-
--->
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="org.eclipse.che.ide.Api"/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.ide.ui.CodenvyUI"/>
-    <inherits name="org.eclipse.che.plugin.testing.TestingExtension"/>
-
-    <source path="ide"/>
-</module>
diff --git a/plugins/plugin-testing/che-plugin-testing-ide/pom.xml b/plugins/plugin-testing/che-plugin-testing-ide/pom.xml
index 3dddb773bf..597f7985b2 100644
--- a/plugins/plugin-testing/che-plugin-testing-ide/pom.xml
+++ b/plugins/plugin-testing/che-plugin-testing-ide/pom.xml
@@ -19,6 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-testing-ide</artifactId>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Testing :: IDE</name>
     <properties>
         <dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
@@ -111,12 +112,6 @@
     </dependencies>
     <build>
         <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.java</include>
-                </includes>
-            </resource>
             <resource>
                 <directory>src/main/resources</directory>
             </resource>
@@ -125,6 +120,14 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.testing.TestingExtension</moduleName>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/src/main/resources/org/eclipse/che/plugin/pullrequest/PullRequest.gwt.xml b/plugins/plugin-testing/che-plugin-testing-ide/src/main/module.gwt.xml
similarity index 76%
rename from plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/src/main/resources/org/eclipse/che/plugin/pullrequest/PullRequest.gwt.xml
rename to plugins/plugin-testing/che-plugin-testing-ide/src/main/module.gwt.xml
index 7705dac576..74caa779e7 100644
--- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/src/main/resources/org/eclipse/che/plugin/pullrequest/PullRequest.gwt.xml
+++ b/plugins/plugin-testing/che-plugin-testing-ide/src/main/module.gwt.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Copyright (c) 2012-2017 Red Hat, Inc.
@@ -12,14 +11,11 @@
 
 -->
 <module>
-    <inherits name="com.google.gwt.user.User"/>
     <inherits name="com.google.gwt.http.HTTP"/>
     <inherits name="com.google.gwt.i18n.I18N"/>
     <inherits name="com.google.gwt.json.JSON"/>
+    <inherits name="com.google.gwt.user.User"/>
     <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.ide.Api"/>
-    <inherits name="org.eclipse.che.ide.ext.git.Git"/>
 
-    <source path="client"/>
-    <source path="shared"/>
+    <source path="ide"/>
 </module>
diff --git a/plugins/plugin-testing/che-plugin-testing-ide/src/main/resources/org/eclipse/che/plugin/testing/TestingExtension.gwt.xml b/plugins/plugin-testing/che-plugin-testing-ide/src/main/resources/org/eclipse/che/plugin/testing/TestingExtension.gwt.xml
deleted file mode 100644
index 57a3e36bf4..0000000000
--- a/plugins/plugin-testing/che-plugin-testing-ide/src/main/resources/org/eclipse/che/plugin/testing/TestingExtension.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<module>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="org.eclipse.che.ide.Api"/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.ide.ui.CodenvyUI"/>
-    <inherits name="org.eclipse.che.ide.ext.java.Java"/>
-
-    <source path="ide"/>
-    <source path="client"/>
-    <source path="shared"/>
-</module>
diff --git a/plugins/plugin-traefik/plugin-traefik-docker/pom.xml b/plugins/plugin-traefik/plugin-traefik-docker/pom.xml
index 78d6910231..c81d705456 100644
--- a/plugins/plugin-traefik/plugin-traefik-docker/pom.xml
+++ b/plugins/plugin-traefik/plugin-traefik-docker/pom.xml
@@ -62,14 +62,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml b/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml
index a8097ab836..9630f57429 100644
--- a/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml
+++ b/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml
@@ -19,21 +19,4 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-web-ext-shared</artifactId>
-    <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
-    </build>
 </project>
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/pom.xml b/plugins/plugin-web/che-plugin-web-ext-web/pom.xml
index 2033deea35..0be84a1cbd 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/pom.xml
+++ b/plugins/plugin-web/che-plugin-web-ext-web/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-web-ext-web</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Web :: File Types</name>
     <properties>
         <findbugs.failonerror>false</findbugs.failonerror>
@@ -45,6 +45,11 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-web-ext-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-web-ext-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>
             <artifactId>gwt-elemental</artifactId>
@@ -77,20 +82,31 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.web.Web</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level
+                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.plugin:che-plugin-web-ext-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebExtension.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebExtension.java
similarity index 91%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebExtension.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebExtension.java
index adfceef232..545c5614c8 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebExtension.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebExtension.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web;
+package org.eclipse.che.plugin.web.client;
 
 import static org.eclipse.che.ide.api.action.IdeActions.GROUP_ASSISTANT;
 import static org.eclipse.che.ide.api.action.IdeActions.GROUP_FILE_NEW;
@@ -25,13 +25,13 @@ import org.eclipse.che.ide.api.filetypes.FileType;
 import org.eclipse.che.ide.api.filetypes.FileTypeRegistry;
 import org.eclipse.che.ide.api.icon.Icon;
 import org.eclipse.che.ide.api.icon.IconRegistry;
-import org.eclipse.che.ide.ext.web.css.NewCssFileAction;
-import org.eclipse.che.ide.ext.web.css.NewLessFileAction;
-import org.eclipse.che.ide.ext.web.html.NewHtmlFileAction;
-import org.eclipse.che.ide.ext.web.html.PreviewHTMLAction;
-import org.eclipse.che.ide.ext.web.html.editor.HtmlEditorProvider;
-import org.eclipse.che.ide.ext.web.js.NewJavaScriptFileAction;
-import org.eclipse.che.ide.ext.web.js.editor.JsEditorProvider;
+import org.eclipse.che.plugin.web.client.css.NewCssFileAction;
+import org.eclipse.che.plugin.web.client.css.NewLessFileAction;
+import org.eclipse.che.plugin.web.client.html.NewHtmlFileAction;
+import org.eclipse.che.plugin.web.client.html.PreviewHTMLAction;
+import org.eclipse.che.plugin.web.client.html.editor.HtmlEditorProvider;
+import org.eclipse.che.plugin.web.client.js.NewJavaScriptFileAction;
+import org.eclipse.che.plugin.web.client.js.editor.JsEditorProvider;
 import org.vectomatic.dom.svg.ui.SVGImage;
 
 /**
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebExtensionResource.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebExtensionResource.java
similarity index 95%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebExtensionResource.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebExtensionResource.java
index f6160edf6a..d6ae2fc486 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebExtensionResource.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebExtensionResource.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web;
+package org.eclipse.che.plugin.web.client;
 
 import com.google.gwt.resources.client.ClientBundle;
 import org.vectomatic.dom.svg.ui.SVGResource;
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebLocalizationConstant.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebLocalizationConstant.java
similarity index 96%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebLocalizationConstant.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebLocalizationConstant.java
index 519c916781..0d2794f544 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/WebLocalizationConstant.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/WebLocalizationConstant.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web;
+package org.eclipse.che.plugin.web.client;
 
 import com.google.gwt.i18n.client.Messages;
 
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/css/NewCssFileAction.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/css/NewCssFileAction.java
similarity index 94%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/css/NewCssFileAction.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/css/NewCssFileAction.java
index b56294d83d..285817e925 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/css/NewCssFileAction.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/css/NewCssFileAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.css;
+package org.eclipse.che.plugin.web.client.css;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -18,9 +18,9 @@ import org.eclipse.che.ide.CoreLocalizationConstant;
 import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.editor.EditorAgent;
 import org.eclipse.che.ide.api.notification.NotificationManager;
-import org.eclipse.che.ide.ext.web.WebLocalizationConstant;
 import org.eclipse.che.ide.newresource.AbstractNewResourceAction;
 import org.eclipse.che.ide.ui.dialogs.DialogFactory;
+import org.eclipse.che.plugin.web.client.WebLocalizationConstant;
 
 /**
  * Action to create new CSS file.
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/css/NewLessFileAction.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/css/NewLessFileAction.java
similarity index 94%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/css/NewLessFileAction.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/css/NewLessFileAction.java
index e0a394a983..39e78df857 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/css/NewLessFileAction.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/css/NewLessFileAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.css;
+package org.eclipse.che.plugin.web.client.css;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -18,9 +18,9 @@ import org.eclipse.che.ide.CoreLocalizationConstant;
 import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.editor.EditorAgent;
 import org.eclipse.che.ide.api.notification.NotificationManager;
-import org.eclipse.che.ide.ext.web.WebLocalizationConstant;
 import org.eclipse.che.ide.newresource.AbstractNewResourceAction;
 import org.eclipse.che.ide.ui.dialogs.DialogFactory;
+import org.eclipse.che.plugin.web.client.WebLocalizationConstant;
 
 /**
  * Action to create new Less file.
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/NewHtmlFileAction.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/NewHtmlFileAction.java
similarity index 94%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/NewHtmlFileAction.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/NewHtmlFileAction.java
index d4f5757e93..25fe56a6cf 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/NewHtmlFileAction.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/NewHtmlFileAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.html;
+package org.eclipse.che.plugin.web.client.html;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -18,9 +18,9 @@ import org.eclipse.che.ide.CoreLocalizationConstant;
 import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.editor.EditorAgent;
 import org.eclipse.che.ide.api.notification.NotificationManager;
-import org.eclipse.che.ide.ext.web.WebLocalizationConstant;
 import org.eclipse.che.ide.newresource.AbstractNewResourceAction;
 import org.eclipse.che.ide.ui.dialogs.DialogFactory;
+import org.eclipse.che.plugin.web.client.WebLocalizationConstant;
 
 /**
  * Action to create new HTML file.
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/PreviewHTMLAction.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/PreviewHTMLAction.java
similarity index 95%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/PreviewHTMLAction.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/PreviewHTMLAction.java
index 25ccbf473e..3c3b6ecca8 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/PreviewHTMLAction.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/PreviewHTMLAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.html;
+package org.eclipse.che.plugin.web.client.html;
 
 import static java.util.Collections.singletonList;
 import static org.eclipse.che.ide.part.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
@@ -21,8 +21,8 @@ import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.resources.File;
 import org.eclipse.che.ide.api.resources.Resource;
 import org.eclipse.che.ide.core.AgentURLModifier;
-import org.eclipse.che.ide.ext.web.WebLocalizationConstant;
 import org.eclipse.che.ide.util.browser.BrowserUtils;
+import org.eclipse.che.plugin.web.client.WebLocalizationConstant;
 
 /**
  * Action for previewing an HTML page.
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/AutoEditStrategyFactory.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/AutoEditStrategyFactory.java
similarity index 93%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/AutoEditStrategyFactory.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/AutoEditStrategyFactory.java
index 582230b423..f6b623e483 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/AutoEditStrategyFactory.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/AutoEditStrategyFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.html.editor;
+package org.eclipse.che.plugin.web.client.html.editor;
 
 import org.eclipse.che.ide.api.editor.changeintercept.TextChangeInterceptor;
 
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/DefaultCodeAssistProcessor.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/DefaultCodeAssistProcessor.java
similarity index 94%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/DefaultCodeAssistProcessor.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/DefaultCodeAssistProcessor.java
index db0cebc9a1..4186081304 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/DefaultCodeAssistProcessor.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/DefaultCodeAssistProcessor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.html.editor;
+package org.eclipse.che.plugin.web.client.html.editor;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLCodeAssistProcessor.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HTMLCodeAssistProcessor.java
similarity index 91%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLCodeAssistProcessor.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HTMLCodeAssistProcessor.java
index 09ef724eee..97c1a37f58 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLCodeAssistProcessor.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HTMLCodeAssistProcessor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.html.editor;
+package org.eclipse.che.plugin.web.client.html.editor;
 
 import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor;
 
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLEditorConfigurationProvider.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HTMLEditorConfigurationProvider.java
similarity index 95%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLEditorConfigurationProvider.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HTMLEditorConfigurationProvider.java
index 15594aa0c3..c1aea2e850 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLEditorConfigurationProvider.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HTMLEditorConfigurationProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.html.editor;
+package org.eclipse.che.plugin.web.client.html.editor;
 
 import com.google.inject.Inject;
 import java.util.Set;
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorConfiguration.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HtmlEditorConfiguration.java
similarity index 98%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorConfiguration.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HtmlEditorConfiguration.java
index edfd76525b..ceb1e3d270 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorConfiguration.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HtmlEditorConfiguration.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.html.editor;
+package org.eclipse.che.plugin.web.client.html.editor;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorProvider.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HtmlEditorProvider.java
similarity index 95%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorProvider.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HtmlEditorProvider.java
index 850a8b1a3c..ff4ecdbd68 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorProvider.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/html/editor/HtmlEditorProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.html.editor;
+package org.eclipse.che.plugin.web.client.html.editor;
 
 import com.google.inject.Inject;
 import org.eclipse.che.ide.api.editor.EditorProvider;
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/inject/WebModule.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/inject/WebModule.java
similarity index 92%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/inject/WebModule.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/inject/WebModule.java
index 3fa5b60508..b4019ac321 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/inject/WebModule.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/inject/WebModule.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.inject;
+package org.eclipse.che.plugin.web.client.inject;
 
 import com.google.gwt.inject.client.AbstractGinModule;
 import com.google.gwt.inject.client.multibindings.GinMultibinder;
@@ -18,8 +18,8 @@ import com.google.inject.name.Named;
 import org.eclipse.che.ide.api.extension.ExtensionGinModule;
 import org.eclipse.che.ide.api.filetypes.FileType;
 import org.eclipse.che.ide.api.project.type.wizard.ProjectWizardRegistrar;
-import org.eclipse.che.ide.ext.web.WebExtensionResource;
-import org.eclipse.che.ide.ext.web.typescript.TSProjectWizardRegistrar;
+import org.eclipse.che.plugin.web.client.WebExtensionResource;
+import org.eclipse.che.plugin.web.client.typescript.TSProjectWizardRegistrar;
 
 /**
  * Adds custom binding for Editors.
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/NewJavaScriptFileAction.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/NewJavaScriptFileAction.java
similarity index 94%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/NewJavaScriptFileAction.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/NewJavaScriptFileAction.java
index 626dc32bbd..5a430dadaf 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/NewJavaScriptFileAction.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/NewJavaScriptFileAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.js;
+package org.eclipse.che.plugin.web.client.js;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -18,9 +18,9 @@ import org.eclipse.che.ide.CoreLocalizationConstant;
 import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.editor.EditorAgent;
 import org.eclipse.che.ide.api.notification.NotificationManager;
-import org.eclipse.che.ide.ext.web.WebLocalizationConstant;
 import org.eclipse.che.ide.newresource.AbstractNewResourceAction;
 import org.eclipse.che.ide.ui.dialogs.DialogFactory;
+import org.eclipse.che.plugin.web.client.WebLocalizationConstant;
 
 /**
  * Action to create new JavaScript file.
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/DefaultCodeAssistProcessor.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/DefaultCodeAssistProcessor.java
similarity index 95%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/DefaultCodeAssistProcessor.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/DefaultCodeAssistProcessor.java
index 7f6999e66e..38657a9939 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/DefaultCodeAssistProcessor.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/DefaultCodeAssistProcessor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.js.editor;
+package org.eclipse.che.plugin.web.client.js.editor;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsCodeAssistProcessor.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsCodeAssistProcessor.java
similarity index 91%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsCodeAssistProcessor.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsCodeAssistProcessor.java
index 1494252b7e..c34466ca14 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsCodeAssistProcessor.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsCodeAssistProcessor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.js.editor;
+package org.eclipse.che.plugin.web.client.js.editor;
 
 import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor;
 
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfiguration.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorConfiguration.java
similarity index 95%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfiguration.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorConfiguration.java
index 46dc24fa0f..f0f89b8a8a 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfiguration.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorConfiguration.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.js.editor;
+package org.eclipse.che.plugin.web.client.js.editor;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -20,7 +20,7 @@ import org.eclipse.che.ide.api.editor.changeintercept.TextChangeInterceptor;
 import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor;
 import org.eclipse.che.ide.api.editor.editorconfig.DefaultTextEditorConfiguration;
 import org.eclipse.che.ide.api.editor.partition.DocumentPartitioner;
-import org.eclipse.che.ide.ext.web.html.editor.AutoEditStrategyFactory;
+import org.eclipse.che.plugin.web.client.html.editor.AutoEditStrategyFactory;
 
 /**
  * The JS type editor configuration.
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfigurationProvider.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorConfigurationProvider.java
similarity index 88%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfigurationProvider.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorConfigurationProvider.java
index 898f42ff8c..baea84c4ed 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfigurationProvider.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorConfigurationProvider.java
@@ -8,12 +8,12 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.js.editor;
+package org.eclipse.che.plugin.web.client.js.editor;
 
 import com.google.inject.Inject;
 import java.util.Set;
 import javax.inject.Provider;
-import org.eclipse.che.ide.ext.web.html.editor.AutoEditStrategyFactory;
+import org.eclipse.che.plugin.web.client.html.editor.AutoEditStrategyFactory;
 
 /**
  * Provider for JS Editor configuration.
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorProvider.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorProvider.java
similarity index 96%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorProvider.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorProvider.java
index 2cfdebfc87..c1a703cb23 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorProvider.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/js/editor/JsEditorProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.js.editor;
+package org.eclipse.che.plugin.web.client.js.editor;
 
 import com.google.inject.Inject;
 import org.eclipse.che.ide.api.editor.EditorProvider;
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/typescript/TSProjectWizardRegistrar.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/typescript/TSProjectWizardRegistrar.java
similarity index 96%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/typescript/TSProjectWizardRegistrar.java
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/typescript/TSProjectWizardRegistrar.java
index 7754d073ff..3d201ff327 100644
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/typescript/TSProjectWizardRegistrar.java
+++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/plugin/web/client/typescript/TSProjectWizardRegistrar.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.ide.ext.web.typescript;
+package org.eclipse.che.plugin.web.client.typescript;
 
 import com.google.inject.Provider;
 import java.util.ArrayList;
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/Web.gwt.xml b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/Web.gwt.xml
deleted file mode 100644
index 30b99c5afe..0000000000
--- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/Web.gwt.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="org.eclipse.che.ide.Api"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-    <inherits name="org.eclipse.che.ide.Api"/>
-    <inherits name="org.eclipse.che.plugin.web.WebShared"/>
-
-    <source path=""/>
-</module>
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/WebLocalizationConstant.properties b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/WebLocalizationConstant.properties
similarity index 100%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/WebLocalizationConstant.properties
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/WebLocalizationConstant.properties
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/category/js.svg b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/category/js.svg
similarity index 100%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/category/js.svg
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/category/js.svg
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/css.svg b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/css.svg
similarity index 100%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/css.svg
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/css.svg
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/html.svg b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/html.svg
similarity index 100%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/html.svg
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/html.svg
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/js.svg b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/js.svg
similarity index 100%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/js.svg
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/js.svg
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/less.svg b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/less.svg
similarity index 100%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/less.svg
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/less.svg
diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/php.svg b/plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/php.svg
similarity index 100%
rename from plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/ide/ext/web/php.svg
rename to plugins/plugin-web/che-plugin-web-ext-web/src/main/resources/org/eclipse/che/plugin/web/client/php.svg
diff --git a/plugins/plugin-yaml/che-plugin-yaml-ide/pom.xml b/plugins/plugin-yaml/che-plugin-yaml-ide/pom.xml
index adbe72bfd2..fe161e213b 100644
--- a/plugins/plugin-yaml/che-plugin-yaml-ide/pom.xml
+++ b/plugins/plugin-yaml/che-plugin-yaml-ide/pom.xml
@@ -19,7 +19,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-yaml-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: Yaml :: Ide</name>
     <dependencies>
         <dependency>
@@ -42,6 +42,11 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-yaml-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-yaml-shared</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -71,6 +76,12 @@
             <artifactId>che-core-api-workspace-shared</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-workspace-shared</artifactId>
+            <classifier>sources</classifier>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.vectomatic</groupId>
             <artifactId>lib-gwt-svg</artifactId>
@@ -113,13 +124,30 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.yaml.Yaml</moduleName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <!-- Ignore *-sources.jar analysis due to the fact that analyzer works at bytecode level                                     but *-sources.jar is required for including to the GWT source path. -->
+                                <dep>org.eclipse.che.plugin:che-plugin-yaml-shared</dep>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/module.gwt.xml b/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/module.gwt.xml
new file mode 100644
index 0000000000..3ae96a2c4b
--- /dev/null
+++ b/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/module.gwt.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2017 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
+<module>
+    <inherits name="org.eclipse.che.api.project.Project"/>
+
+    <source path="ide"/>
+    <source path="shared"/>
+</module>
diff --git a/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/resources/org/eclipse/che/plugin/yaml/Yaml.gwt.xml b/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/resources/org/eclipse/che/plugin/yaml/Yaml.gwt.xml
deleted file mode 100644
index aad7573529..0000000000
--- a/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/resources/org/eclipse/che/plugin/yaml/Yaml.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name='org.eclipse.che.ide.ui.CodenvyUI'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.api.project.Project"/>
-
-    <source path="ide"/>
-    <source path="shared"/>
-</module>
diff --git a/plugins/plugin-yaml/che-plugin-yaml-server/pom.xml b/plugins/plugin-yaml/che-plugin-yaml-server/pom.xml
index d7d6ecc89f..fd4201d6ec 100644
--- a/plugins/plugin-yaml/che-plugin-yaml-server/pom.xml
+++ b/plugins/plugin-yaml/che-plugin-yaml-server/pom.xml
@@ -77,14 +77,4 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/plugins/plugin-yaml/che-plugin-yaml-shared/pom.xml b/plugins/plugin-yaml/che-plugin-yaml-shared/pom.xml
index 68306499f9..19bc8f2642 100644
--- a/plugins/plugin-yaml/che-plugin-yaml-shared/pom.xml
+++ b/plugins/plugin-yaml/che-plugin-yaml-shared/pom.xml
@@ -49,17 +49,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml
index 954d7be1c6..bff09f7f8b 100644
--- a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml
+++ b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml
@@ -16,7 +16,7 @@
         <version>6.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-zend-debugger-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Plugin :: PHP :: Zend Debugger IDE</name>
     <dependencies>
         <dependency>
@@ -87,28 +87,19 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
         <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.zdb.ZendDebugger</moduleName>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/*.png</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/main/module.gwt.xml b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/main/module.gwt.xml
new file mode 100644
index 0000000000..cea03b4405
--- /dev/null
+++ b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/main/module.gwt.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016 Rogue Wave Software, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+    Contributors:
+      Rogue Wave Software, Inc. - initial API and implementation
+-->
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
+<module>
+    <inherits name="org.eclipse.che.api.debug.Debug"/>
+    <source path="ide"/>
+</module>
diff --git a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/main/resources/org/eclipse/che/plugin/zdb/ZendDebugger.gwt.xml b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/main/resources/org/eclipse/che/plugin/zdb/ZendDebugger.gwt.xml
deleted file mode 100644
index a94d91644f..0000000000
--- a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/main/resources/org/eclipse/che/plugin/zdb/ZendDebugger.gwt.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2016 Rogue Wave Software, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-    Contributors:
-      Rogue Wave Software, Inc. - initial API and implementation
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.ide.Core"/>
-    <inherits name="org.eclipse.che.api.debug.Debug"/>
-    <inherits name="org.eclipse.che.plugin.debugger.Debugger"/>
-    <source path="ide"/>
-</module>
diff --git a/pom.xml b/pom.xml
index 740f54f18d..0ee60f717d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
         <module>infrastructures</module>
         <module>plugins</module>
         <module>ide/che-ide-core</module>
+        <module>ide/che-ide-gwt-app</module>
         <module>dashboard</module>
         <module>assembly</module>
         <module>assembly-multiuser</module>
@@ -83,12 +84,6 @@
                 <version>${che.version}</version>
                 <type>war</type>
             </dependency>
-            <dependency>
-                <groupId>org.eclipse.che</groupId>
-                <artifactId>assembly-ide-war</artifactId>
-                <version>${che.version}</version>
-                <classifier>classes</classifier>
-            </dependency>
             <dependency>
                 <groupId>org.eclipse.che</groupId>
                 <artifactId>assembly-main</artifactId>
@@ -137,6 +132,18 @@
                 <type>zip</type>
                 <classifier>linux_amd64</classifier>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che</groupId>
+                <artifactId>che-ide-gwt-app</artifactId>
+                <version>${che.version}</version>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.che</groupId>
+                <artifactId>che-ide-gwt-app</artifactId>
+                <version>${che.version}</version>
+                <type>war</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che</groupId>
                 <artifactId>che-multiuser-keycloak-shared</artifactId>
@@ -267,11 +274,23 @@
                 <artifactId>che-core-api-auth-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-api-auth-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-api-core</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-api-core</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-api-debug</artifactId>
@@ -282,6 +301,12 @@
                 <artifactId>che-core-api-debug-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-api-debug-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-api-dto</artifactId>
@@ -308,6 +333,12 @@
                 <artifactId>che-core-api-factory-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-api-factory-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-api-git</artifactId>
@@ -324,6 +355,12 @@
                 <artifactId>che-core-api-git-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-api-git-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-api-infrastructure-local</artifactId>
@@ -360,11 +397,23 @@
                 <artifactId>che-core-api-languageserver-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-api-languageserver-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-api-model</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-api-model</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-api-oauth</artifactId>
@@ -380,6 +429,12 @@
                 <artifactId>che-core-api-project-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-api-project-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-api-project-templates</artifactId>
@@ -390,6 +445,12 @@
                 <artifactId>che-core-api-project-templates-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-api-project-templates-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-api-ssh</artifactId>
@@ -406,6 +467,12 @@
                 <artifactId>che-core-api-ssh-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-api-ssh-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-api-system</artifactId>
@@ -426,6 +493,12 @@
                 <artifactId>che-core-api-testing-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-api-testing-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-api-user</artifactId>
@@ -442,6 +515,12 @@
                 <artifactId>che-core-api-user-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-api-user-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-api-workspace</artifactId>
@@ -458,6 +537,12 @@
                 <artifactId>che-core-api-workspace-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-api-workspace-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-commons-annotations</artifactId>
@@ -473,6 +558,12 @@
                 <artifactId>che-core-commons-gwt</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-commons-gwt</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-commons-inject</artifactId>
@@ -533,15 +624,33 @@
                 <artifactId>che-core-gwt-logger</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-gwt-logger</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-ide-api</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-ide-api</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-ide-app</artifactId>
+                <version>${che.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-ide-app</artifactId>
                 <version>${che.version}</version>
+                <type>gwt-lib</type>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
@@ -563,11 +672,23 @@
                 <artifactId>che-core-ide-ui</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-ide-ui</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-orion-editor</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-orion-editor</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-core-sql-schema</artifactId>
@@ -578,6 +699,12 @@
                 <artifactId>che-ide-core</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-ide-core</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.core</groupId>
                 <artifactId>che-wsagent-core</artifactId>
@@ -732,6 +859,12 @@
                 <artifactId>che-multiuser-keycloak-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.multiuser</groupId>
+                <artifactId>che-multiuser-keycloak-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.multiuser</groupId>
                 <artifactId>che-multiuser-keycloak-server</artifactId>
@@ -742,6 +875,12 @@
                 <artifactId>che-multiuser-keycloak-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.multiuser</groupId>
+                <artifactId>che-multiuser-keycloak-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.multiuser</groupId>
                 <artifactId>che-multiuser-keycloak-token-provider</artifactId>
@@ -767,11 +906,23 @@
                 <artifactId>che-multiuser-machine-authentication-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.multiuser</groupId>
+                <artifactId>che-multiuser-machine-authentication-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.multiuser</groupId>
                 <artifactId>che-multiuser-machine-authentication-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.multiuser</groupId>
+                <artifactId>che-multiuser-machine-authentication-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.multiuser</groupId>
                 <artifactId>che-multiuser-permission-factory</artifactId>
@@ -822,6 +973,7 @@
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-activity-ide</artifactId>
                 <version>${che.version}</version>
+                <type>gwt-lib</type>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
@@ -843,6 +995,12 @@
                 <artifactId>che-plugin-composer-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-composer-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-composer-server</artifactId>
@@ -853,11 +1011,23 @@
                 <artifactId>che-plugin-composer-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-composer-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-cpp-lang-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-cpp-lang-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-cpp-lang-server</artifactId>
@@ -868,11 +1038,23 @@
                 <artifactId>che-plugin-cpp-lang-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-cpp-lang-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-csharp-lang-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-csharp-lang-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-csharp-lang-server</artifactId>
@@ -883,11 +1065,23 @@
                 <artifactId>che-plugin-csharp-lang-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-csharp-lang-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-debugger-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-debugger-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-docker-machine</artifactId>
@@ -898,6 +1092,12 @@
                 <artifactId>che-plugin-ext-dashboard-client</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-ext-dashboard-client</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-factory-ide</artifactId>
@@ -918,6 +1118,12 @@
                 <artifactId>che-plugin-gdb-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-gdb-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-gdb-server</artifactId>
@@ -928,6 +1134,12 @@
                 <artifactId>che-plugin-git-ext-git</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-git-ext-git</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-github-factory-resolver</artifactId>
@@ -938,6 +1150,12 @@
                 <artifactId>che-plugin-github-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-github-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-github-oauth2</artifactId>
@@ -953,6 +1171,12 @@
                 <artifactId>che-plugin-github-pullrequest</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-github-pullrequest</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-github-server</artifactId>
@@ -963,20 +1187,39 @@
                 <artifactId>che-plugin-github-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-github-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-gwt-ext-gwt</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-gwt-ext-gwt</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-help-ext-client</artifactId>
                 <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-java-debugger-ide</artifactId>
+                <version>${che.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-java-debugger-ide</artifactId>
                 <version>${che.version}</version>
+                <type>gwt-lib</type>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
@@ -988,6 +1231,12 @@
                 <artifactId>che-plugin-java-ext-lang-client</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-java-ext-lang-client</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-java-ext-lang-server</artifactId>
@@ -998,6 +1247,12 @@
                 <artifactId>che-plugin-java-ext-lang-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-java-ext-lang-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-java-maven-tools</artifactId>
@@ -1008,6 +1263,12 @@
                 <artifactId>che-plugin-java-plain-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-java-plain-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-java-plain-server</artifactId>
@@ -1018,6 +1279,12 @@
                 <artifactId>che-plugin-java-plain-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-java-plain-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-json-server</artifactId>
@@ -1027,12 +1294,19 @@
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-keybinding-eclipse-ide</artifactId>
                 <version>${che.version}</version>
+                <type>gwt-lib</type>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-languageserver-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-languageserver-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-machine-ext-server</artifactId>
@@ -1043,6 +1317,12 @@
                 <artifactId>che-plugin-machine-ssh-client</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-machine-ssh-client</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-maven-generator-archetype</artifactId>
@@ -1053,6 +1333,12 @@
                 <artifactId>che-plugin-maven-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-maven-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-maven-server</artifactId>
@@ -1063,11 +1349,23 @@
                 <artifactId>che-plugin-maven-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-maven-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-nodejs-debugger-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-nodejs-debugger-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-nodejs-debugger-server</artifactId>
@@ -1078,6 +1376,12 @@
                 <artifactId>che-plugin-nodejs-lang-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-nodejs-lang-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-nodejs-lang-server</artifactId>
@@ -1088,15 +1392,33 @@
                 <artifactId>che-plugin-nodejs-lang-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-nodejs-lang-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-orion-compare</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-orion-compare</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-php-lang-ide</artifactId>
+                <version>${che.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-php-lang-ide</artifactId>
                 <version>${che.version}</version>
+                <type>gwt-lib</type>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
@@ -1108,15 +1430,33 @@
                 <artifactId>che-plugin-php-lang-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-php-lang-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-product-info</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-product-info</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-pullrequest-ide</artifactId>
+                <version>${che.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-pullrequest-ide</artifactId>
                 <version>${che.version}</version>
+                <type>gwt-lib</type>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
@@ -1128,11 +1468,23 @@
                 <artifactId>che-plugin-pullrequest-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-pullrequest-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-python-lang-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-python-lang-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-python-lang-server</artifactId>
@@ -1143,11 +1495,23 @@
                 <artifactId>che-plugin-python-lang-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-python-lang-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-sdk-ext-plugins</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-sdk-ext-plugins</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-sdk-tools</artifactId>
@@ -1164,6 +1528,12 @@
                 <artifactId>che-plugin-ssh-key-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-ssh-key-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-ssh-key-server</artifactId>
@@ -1184,11 +1554,23 @@
                 <artifactId>che-plugin-testing-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-testing-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-testing-junit-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-testing-junit-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-testing-junit-runtime</artifactId>
@@ -1204,6 +1586,12 @@
                 <artifactId>che-plugin-testing-phpunit-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-testing-phpunit-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-testing-phpunit-server</artifactId>
@@ -1214,6 +1602,12 @@
                 <artifactId>che-plugin-testing-testng-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-testing-testng-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-testing-testng-runtime</artifactId>
@@ -1239,15 +1633,28 @@
                 <artifactId>che-plugin-web-ext-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-web-ext-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-web-ext-web</artifactId>
                 <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-yaml-ide</artifactId>
+                <version>${che.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-yaml-ide</artifactId>
                 <version>${che.version}</version>
+                <type>gwt-lib</type>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
@@ -1259,11 +1666,23 @@
                 <artifactId>che-plugin-yaml-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-yaml-shared</artifactId>
+                <version>${che.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-zend-debugger-ide</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-zend-debugger-ide</artifactId>
+                <version>${che.version}</version>
+                <type>gwt-lib</type>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-zend-debugger-server</artifactId>
@@ -1436,6 +1855,30 @@
             <url>https://maven.codenvycorp.com/content/repositories/codenvy-public-snapshots/</url>
         </pluginRepository>
     </pluginRepositories>
+    <build>
+        <plugins>
+            <plugin>
+                <!-- Configuration for launching GWT Super DevMode with gwt:codeserver -->
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                    <codeserverArgs>
+                        <arg>-noprecompile</arg>
+                        <arg>-noincremental</arg>
+                        <!-- For che-in-che development, the CodeServer launched
+                             inside a container must be reachable at local machine. -->
+                        <arg>-bindAddress</arg>
+                        <arg>0.0.0.0</arg>
+                    </codeserverArgs>
+                    <jvmArgs>
+                        <arg>${gwt.compiler.jvmArgs.Xss}</arg>
+                        <arg>${gwt.compiler.jvmArgs.Xmx}</arg>
+                    </jvmArgs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <profiles>
         <!-- Profile for building Che faster by skipping unit tests, license checks and other enforcement features -->
         <profile>
diff --git a/wsagent/che-core-api-debug-shared/pom.xml b/wsagent/che-core-api-debug-shared/pom.xml
index 81b450b596..e926c1c543 100644
--- a/wsagent/che-core-api-debug-shared/pom.xml
+++ b/wsagent/che-core-api-debug-shared/pom.xml
@@ -35,11 +35,4 @@
             <artifactId>che-core-commons-annotations</artifactId>
         </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/wsagent/che-core-api-debug/pom.xml b/wsagent/che-core-api-debug/pom.xml
index 8716d67278..4f205d436b 100644
--- a/wsagent/che-core-api-debug/pom.xml
+++ b/wsagent/che-core-api-debug/pom.xml
@@ -85,17 +85,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.eclipse.che.core</groupId>
diff --git a/wsagent/che-core-api-git-shared/pom.xml b/wsagent/che-core-api-git-shared/pom.xml
index ca79511039..b73e2f1345 100644
--- a/wsagent/che-core-api-git-shared/pom.xml
+++ b/wsagent/che-core-api-git-shared/pom.xml
@@ -39,11 +39,4 @@
             <artifactId>che-core-commons-annotations</artifactId>
         </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/wsagent/che-core-api-git/pom.xml b/wsagent/che-core-api-git/pom.xml
index 8af1835289..e6c2d56f5f 100644
--- a/wsagent/che-core-api-git/pom.xml
+++ b/wsagent/che-core-api-git/pom.xml
@@ -136,28 +136,6 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${project.build.directory}/generated-sources/dto/</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/wsagent/che-core-api-languageserver-shared/pom.xml b/wsagent/che-core-api-languageserver-shared/pom.xml
index 42d11fefb8..4122e2e234 100644
--- a/wsagent/che-core-api-languageserver-shared/pom.xml
+++ b/wsagent/che-core-api-languageserver-shared/pom.xml
@@ -35,28 +35,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>pre-compile</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/wsagent/che-core-api-languageserver/pom.xml b/wsagent/che-core-api-languageserver/pom.xml
index 30da251cac..4803c084c8 100644
--- a/wsagent/che-core-api-languageserver/pom.xml
+++ b/wsagent/che-core-api-languageserver/pom.xml
@@ -127,25 +127,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${generated.sources.directory}</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/wsagent/che-core-api-project-shared/pom.xml b/wsagent/che-core-api-project-shared/pom.xml
index 0623995446..f579683b93 100644
--- a/wsagent/che-core-api-project-shared/pom.xml
+++ b/wsagent/che-core-api-project-shared/pom.xml
@@ -60,17 +60,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${generated.sources.directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.eclipse.che.core</groupId>
diff --git a/wsagent/che-core-api-project/pom.xml b/wsagent/che-core-api-project/pom.xml
index 2b16db9dff..91d74dc12b 100644
--- a/wsagent/che-core-api-project/pom.xml
+++ b/wsagent/che-core-api-project/pom.xml
@@ -221,17 +221,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${generated.sources.directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/wsagent/che-core-api-testing-shared/pom.xml b/wsagent/che-core-api-testing-shared/pom.xml
index 50848d6c88..f16ede8a15 100644
--- a/wsagent/che-core-api-testing-shared/pom.xml
+++ b/wsagent/che-core-api-testing-shared/pom.xml
@@ -36,11 +36,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>com.mycila</groupId>
diff --git a/wsagent/che-core-api-testing/pom.xml b/wsagent/che-core-api-testing/pom.xml
index 2ac93354fb..ab99603a09 100644
--- a/wsagent/che-core-api-testing/pom.xml
+++ b/wsagent/che-core-api-testing/pom.xml
@@ -100,17 +100,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>com.mycila</groupId>
diff --git a/wsagent/che-core-ssh-key-ide/pom.xml b/wsagent/che-core-ssh-key-ide/pom.xml
index 365341fb39..b492082286 100644
--- a/wsagent/che-core-ssh-key-ide/pom.xml
+++ b/wsagent/che-core-ssh-key-ide/pom.xml
@@ -20,10 +20,9 @@
     </parent>
     <groupId>org.eclipse.che.plugin</groupId>
     <artifactId>che-plugin-ssh-key-ide</artifactId>
-    <packaging>jar</packaging>
+    <packaging>gwt-lib</packaging>
     <name>Che Core :: SSH Key :: Client</name>
     <properties>
-        <dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
         <findbugs.failonerror>false</findbugs.failonerror>
     </properties>
     <dependencies>
@@ -110,16 +109,15 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.ltgt.gwt.maven</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>org.eclipse.che.plugin.ssh.key.SshKey</moduleName>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/wsagent/che-core-ssh-key-ide/src/main/module.gwt.xml b/wsagent/che-core-ssh-key-ide/src/main/module.gwt.xml
new file mode 100644
index 0000000000..85ba56e5da
--- /dev/null
+++ b/wsagent/che-core-ssh-key-ide/src/main/module.gwt.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2017 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
+<module>
+    <inherits name="com.google.gwt.user.User"/>
+    <inherits name="com.google.gwt.http.HTTP"/>
+    <inherits name="com.google.gwt.i18n.I18N"/>
+    <inherits name="com.google.gwt.json.JSON"/>
+    <inherits name="com.google.gwt.inject.Inject"/>
+    <inherits name="org.eclipse.che.api.ssh.Ssh"/>
+</module>
diff --git a/wsagent/che-core-ssh-key-ide/src/main/resources/org/eclipse/che/plugin/ssh/key/SshKey.gwt.xml b/wsagent/che-core-ssh-key-ide/src/main/resources/org/eclipse/che/plugin/ssh/key/SshKey.gwt.xml
deleted file mode 100644
index 999345002c..0000000000
--- a/wsagent/che-core-ssh-key-ide/src/main/resources/org/eclipse/che/plugin/ssh/key/SshKey.gwt.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2012-2017 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <inherits name="com.google.gwt.user.User"/>
-    <inherits name="com.google.gwt.http.HTTP"/>
-    <inherits name="com.google.gwt.i18n.I18N"/>
-    <inherits name="com.google.gwt.json.JSON"/>
-    <inherits name='org.eclipse.che.ide.Api'/>
-    <inherits name="com.google.gwt.inject.Inject"/>
-    <inherits name="org.eclipse.che.ide.ui.CodenvyUI"/>
-    <inherits name="org.eclipse.che.api.ssh.Ssh"/>
-
-    <source path="client"/>
-</module>
diff --git a/wsagent/che-core-ssh-key-server/pom.xml b/wsagent/che-core-ssh-key-server/pom.xml
index 4a92ee1752..16bf4666e5 100644
--- a/wsagent/che-core-ssh-key-server/pom.xml
+++ b/wsagent/che-core-ssh-key-server/pom.xml
@@ -95,17 +95,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-    </build>
 </project>
diff --git a/wsmaster/che-core-api-auth-shared/pom.xml b/wsmaster/che-core-api-auth-shared/pom.xml
index 2e19263013..b4e98311d5 100644
--- a/wsmaster/che-core-api-auth-shared/pom.xml
+++ b/wsmaster/che-core-api-auth-shared/pom.xml
@@ -40,17 +40,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/wsmaster/che-core-api-factory-shared/pom.xml b/wsmaster/che-core-api-factory-shared/pom.xml
index b550519408..ea84add3e2 100644
--- a/wsmaster/che-core-api-factory-shared/pom.xml
+++ b/wsmaster/che-core-api-factory-shared/pom.xml
@@ -49,17 +49,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/wsmaster/che-core-api-installer/pom.xml b/wsmaster/che-core-api-installer/pom.xml
index 0667bdc31e..46e3cf27e8 100644
--- a/wsmaster/che-core-api-installer/pom.xml
+++ b/wsmaster/che-core-api-installer/pom.xml
@@ -163,20 +163,6 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${project.build.directory}/generated-sources/dto/</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/wsmaster/che-core-api-project-templates-shared/pom.xml b/wsmaster/che-core-api-project-templates-shared/pom.xml
index 92338dad38..0ac5fbfceb 100644
--- a/wsmaster/che-core-api-project-templates-shared/pom.xml
+++ b/wsmaster/che-core-api-project-templates-shared/pom.xml
@@ -43,17 +43,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.eclipse.che.core</groupId>
diff --git a/wsmaster/che-core-api-ssh-shared/pom.xml b/wsmaster/che-core-api-ssh-shared/pom.xml
index 0bea6050f9..e98ac8250b 100644
--- a/wsmaster/che-core-api-ssh-shared/pom.xml
+++ b/wsmaster/che-core-api-ssh-shared/pom.xml
@@ -43,14 +43,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.eclipse.che.core</groupId>
diff --git a/wsmaster/che-core-api-ssh/pom.xml b/wsmaster/che-core-api-ssh/pom.xml
index 9589aff32a..324dae06e5 100644
--- a/wsmaster/che-core-api-ssh/pom.xml
+++ b/wsmaster/che-core-api-ssh/pom.xml
@@ -163,17 +163,6 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <outputDirectory>target/classes</outputDirectory>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
         <plugins>
             <!-- Create the test jar -->
             <plugin>
diff --git a/wsmaster/che-core-api-system-shared/pom.xml b/wsmaster/che-core-api-system-shared/pom.xml
index 3f138aa88c..02e8d419eb 100644
--- a/wsmaster/che-core-api-system-shared/pom.xml
+++ b/wsmaster/che-core-api-system-shared/pom.xml
@@ -44,17 +44,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${project.build.directory}/generated-sources/dto/</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/wsmaster/che-core-api-system/pom.xml b/wsmaster/che-core-api-system/pom.xml
index 81ff49f575..c76af6a46f 100644
--- a/wsmaster/che-core-api-system/pom.xml
+++ b/wsmaster/che-core-api-system/pom.xml
@@ -119,17 +119,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${project.build.directory}/generated-sources/dto/</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/wsmaster/che-core-api-user-shared/pom.xml b/wsmaster/che-core-api-user-shared/pom.xml
index 5d393a6495..5231f7ecb1 100644
--- a/wsmaster/che-core-api-user-shared/pom.xml
+++ b/wsmaster/che-core-api-user-shared/pom.xml
@@ -47,17 +47,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.eclipse.che.core</groupId>
diff --git a/wsmaster/che-core-api-workspace-shared/pom.xml b/wsmaster/che-core-api-workspace-shared/pom.xml
index 9daa9332ed..598378e97d 100644
--- a/wsmaster/che-core-api-workspace-shared/pom.xml
+++ b/wsmaster/che-core-api-workspace-shared/pom.xml
@@ -52,17 +52,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${dto-generator-out-directory}</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.eclipse.che.core</groupId>