diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/client/.classpath b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/client/.classpath
new file mode 100644
index 00000000..0db7d096
--- /dev/null
+++ b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/client/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="com.gwtplugins.gwt.eclipse.core.GWT_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/${PROJECTNAME}.shared"/>
+	<classpathentry kind="output" path="war/WEB-INF/classes"/>
+</classpath>
diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/client/.project b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/client/.project
new file mode 100644
index 00000000..5adcd00d
--- /dev/null
+++ b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/client/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>t.client</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.gwtplugins.gdt.eclipse.core.webAppProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.gwtplugins.gwt.eclipse.core.gwtProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>com.gwtplugins.gwt.eclipse.core.gwtNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/server/.classpath b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/server/.classpath
new file mode 100644
index 00000000..cf78e5e5
--- /dev/null
+++ b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/server/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/${PROJECTNAME}.shared"/>
+	<classpathentry kind="con" path="com.gwtplugins.gwt.eclipse.core.GWT_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/server/.project b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/server/.project
new file mode 100644
index 00000000..6d51ce23
--- /dev/null
+++ b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/server/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>t.server</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.gwtplugins.gdt.eclipse.core.webAppProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.gwtplugins.gwt.eclipse.core.gwtProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>com.gwtplugins.gwt.eclipse.core.gwtNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/shared/.classpath b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/shared/.classpath
new file mode 100644
index 00000000..1efd7fe7
--- /dev/null
+++ b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/shared/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="com.gwtplugins.gwt.eclipse.core.GWT_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/shared/.project b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/shared/.project
new file mode 100644
index 00000000..9e69f1e5
--- /dev/null
+++ b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/client_server_shared/shared/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>t.shared</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.gwtplugins.gdt.eclipse.core.webAppProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.gwtplugins.gwt.eclipse.core.gwtProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>com.gwtplugins.gwt.eclipse.core.gwtNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/client/.classpath b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/client/.classpath
new file mode 100644
index 00000000..9615df74
--- /dev/null
+++ b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/client/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/${PROJECTNAME}.shared"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/client/.project b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/client/.project
new file mode 100644
index 00000000..4e66fd78
--- /dev/null
+++ b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/client/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>t.client</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/server/.classpath b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/server/.classpath
new file mode 100644
index 00000000..9615df74
--- /dev/null
+++ b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/server/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/${PROJECTNAME}.shared"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/server/.project b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/server/.project
new file mode 100644
index 00000000..a7639c4b
--- /dev/null
+++ b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/server/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>t.server</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/shared/.classpath b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/shared/.classpath
new file mode 100644
index 00000000..6073fcf9
--- /dev/null
+++ b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/shared/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/shared/.project b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/shared/.project
new file mode 100644
index 00000000..e629eaba
--- /dev/null
+++ b/plugins/com.gwtplugins.gdt.eclipse.suite/project_templates/empty_multiproject/shared/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>t.shared</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/src/com/google/gdt/eclipse/suite/wizards/NewWebAppTemplateProjectWizardPage.java b/plugins/com.gwtplugins.gdt.eclipse.suite/src/com/google/gdt/eclipse/suite/wizards/NewWebAppTemplateProjectWizardPage.java
index a18611d9..95b3c3cd 100644
--- a/plugins/com.gwtplugins.gdt.eclipse.suite/src/com/google/gdt/eclipse/suite/wizards/NewWebAppTemplateProjectWizardPage.java
+++ b/plugins/com.gwtplugins.gdt.eclipse.suite/src/com/google/gdt/eclipse/suite/wizards/NewWebAppTemplateProjectWizardPage.java
@@ -172,6 +172,19 @@ public void modifyText(ModifyEvent e) {
     final Label templateLabel = new Label(containerOfComponents, SWT.NONE);
     templateLabel.setText("Select Template:");
     templateCombo = new Combo(containerOfComponents, SWT.NONE);
+    templateCombo.addSelectionListener(new SelectionListener() {
+
+      @Override
+      public void widgetSelected(SelectionEvent evt) {
+        int index = templateCombo.getSelectionIndex();
+        ProjectTemplate template = templates.get(index);
+        templateCombo.setToolTipText(template.getDescription());
+      }
+
+      @Override
+      public void widgetDefaultSelected(SelectionEvent arg0) {
+      }
+    });
     GridData gd3 = new GridData(GridData.FILL_HORIZONTAL);
     gd3.horizontalSpan = 2;
     templateCombo.setLayoutData(gd3);
diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/src/com/google/gdt/eclipse/suite/wizards/ProjectTemplate.java b/plugins/com.gwtplugins.gdt.eclipse.suite/src/com/google/gdt/eclipse/suite/wizards/ProjectTemplate.java
index 15110839..12ca49a7 100644
--- a/plugins/com.gwtplugins.gdt.eclipse.suite/src/com/google/gdt/eclipse/suite/wizards/ProjectTemplate.java
+++ b/plugins/com.gwtplugins.gdt.eclipse.suite/src/com/google/gdt/eclipse/suite/wizards/ProjectTemplate.java
@@ -152,6 +152,11 @@ public String getName()
     return config.getRootElement().getChild("name").getTextNormalize();
   }
 
+  public String getDescription()
+  {
+    return config.getRootElement().getChild("description").getTextNormalize();
+  }
+
   /**
    * @param i
    * @return