diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/onlinehelp/IOnlineHelpResourceLocatorService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IOnlineHelpResourceLocatorService.java
similarity index 96%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/onlinehelp/IOnlineHelpResourceLocatorService.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IOnlineHelpResourceLocatorService.java
index 61b50af1fba80f34e55f41b01557d2107d49f083..72b246dd2d5585214f1cd3d0aa8146ac95528286 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/onlinehelp/IOnlineHelpResourceLocatorService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IOnlineHelpResourceLocatorService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp;
+package ch.systemsx.cisd.openbis.generic.client.web.client;
 
 /**
  * A interface for getting the resources necessary for the help system. Online help is broken into
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.java
index 33481a2277ea49636d1e835673cc1afb8a251923..85e7546329b40980037d1e84777a0d0f10f981cc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.java
@@ -21,9 +21,9 @@ import com.extjs.gxt.ui.client.widget.ContentPanel;
 import com.extjs.gxt.ui.client.widget.Header;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.HelpPageIdentifier;
 
 /**
  * A default {@link ITabItem} implementation with various factory methods.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ITabItem.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ITabItem.java
index 51fd4f23818dbf89f3f4f6af26cd861c9e8bed47..60a3ca9fee6551fce7d79909b6e75b67594433c7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ITabItem.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ITabItem.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.framework
 import com.extjs.gxt.ui.client.widget.Component;
 import com.extjs.gxt.ui.client.widget.TabItem;
 
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.HelpPageIdentifier;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier;
 
 /**
  * An interface which contains everything to create a {@link TabItem}.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainTabPanel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainTabPanel.java
index e31c78081a9ab1135c0f747a23712bc8f73d9bf5..bb95db6ce7c036fe496c1bcadb6ed33964d3f302 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainTabPanel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainTabPanel.java
@@ -40,9 +40,9 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAs
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.ConfirmationDialog;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.WindowUtils;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.HelpPageIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.basic.URLMethodWithParameters;
 
 /**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/onlinehelp/HelpPageIdentifier.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/help/HelpPageIdentifier.java
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/onlinehelp/HelpPageIdentifier.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/help/HelpPageIdentifier.java
index d9e3ecd5f8af21124feb2101a1c0131bff9e12eb..871e5dc10f558fd6b61d4b63ec0836e98007d73d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/onlinehelp/HelpPageIdentifier.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/help/HelpPageIdentifier.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp;
+package ch.systemsx.cisd.openbis.generic.client.web.client.application.help;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
index b460408a72dfefd670ae707ca13c601300e792b0..da89d1385a1b1dd7e53d51d09ad3a403d288becf 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
@@ -31,6 +31,7 @@ import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.servlet.IRequestContextProvider;
 import ch.systemsx.cisd.openbis.BuildAndEnvironmentInfo;
 import ch.systemsx.cisd.openbis.generic.client.web.client.IClientService;
+import ch.systemsx.cisd.openbis.generic.client.web.client.IOnlineHelpResourceLocatorService;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ApplicationInfo;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DefaultResultSetConfig;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.IResultSetConfig;
@@ -41,7 +42,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SessionContext;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.TableExportCriteria;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.User;
 import ch.systemsx.cisd.openbis.generic.client.web.client.exception.InvalidSessionException;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.IOnlineHelpResourceLocatorService;
 import ch.systemsx.cisd.openbis.generic.client.web.server.resultset.CacheManager;
 import ch.systemsx.cisd.openbis.generic.client.web.server.resultset.CachedResultSetManager;
 import ch.systemsx.cisd.openbis.generic.client.web.server.resultset.IOriginalDataProvider;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.java
index 893903becfea137c58b68e16ff7fecd5a71b23b9..8b0cd6de038f3ea3d048cee6029088b21d676cd0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.java
@@ -26,8 +26,8 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.AbstractController;
 
 import ch.systemsx.cisd.common.utilities.Template;
+import ch.systemsx.cisd.openbis.generic.client.web.client.IOnlineHelpResourceLocatorService;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.IOnlineHelpResourceLocatorService;
 import ch.systemsx.cisd.openbis.generic.shared.ResourceNames;
 
 /**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DtoConverters.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DtoConverters.java
index ac66ef7f8046c71a00c83a8a47b86623a372da06..45fecfb0dd25ea7d42c75a11ccc355dcbcb37487 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DtoConverters.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DtoConverters.java
@@ -105,7 +105,6 @@ public class DtoConverters
         // BeanUtils.Converter
         //
 
-        @SuppressWarnings("unused")
         public final DataTypeCode convertToCode(final DataTypePE dataType)
         {
             return DataTypeCode.valueOf(dataType.getCode().name());
@@ -130,13 +129,11 @@ public class DtoConverters
         // BeanUtils.Converter
         //
 
-        @SuppressWarnings("unused")
         public final String convertToDescription(final VocabularyPE vocabulary)
         {
             return StringEscapeUtils.escapeHtml(vocabulary.getDescription());
         }
 
-        @SuppressWarnings("unused")
         public final List<VocabularyTerm> convertToTerms(final VocabularyPE vocabulary)
         {
             final Set<VocabularyTermPE> terms = vocabulary.getTerms();
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServletTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServletTest.java
index c239d0c801b60f78127707db17c79cc453a8ce53..0b7e8d77c9c43b6d41fb292a44c9d2d2b1da0eb3 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServletTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServletTest.java
@@ -27,8 +27,8 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import ch.rinn.restrictions.Friend;
+import ch.systemsx.cisd.openbis.generic.client.web.client.IOnlineHelpResourceLocatorService;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.IOnlineHelpResourceLocatorService;
 
 /**
  * @author Chandrasekhar Ramakrishnan
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/HelpPageIdentifierTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/HelpPageIdentifierTest.java
index 499dcfb62fa57cfd9b3ed97d99dd20d016205023..2cd6a74343c43ca418d6db1ca4a2b7ac051fd35d 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/HelpPageIdentifierTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/HelpPageIdentifierTest.java
@@ -23,9 +23,9 @@ import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import ch.rinn.restrictions.Friend;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.HelpPageIdentifier;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.HelpPageIdentifier.HelpPageAction;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.HelpPageIdentifier.HelpPageDomain;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier.HelpPageAction;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier.HelpPageDomain;
 
 /**
  * Test generation of page titles from {@link HelpPageIdentifier}s.