diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/gui/AbstractWebStartClientServingServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/AbstractWebStartClientServingServlet.java
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/gui/AbstractWebStartClientServingServlet.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/AbstractWebStartClientServingServlet.java
index 0625fb5828a03246c26518748c04cc8746b7e8f1..a20e94db789fc2c8a6e6f0e4df46a45ac963dac8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/gui/AbstractWebStartClientServingServlet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/AbstractWebStartClientServingServlet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.generic.server.api.gui;
+package ch.systemsx.cisd.openbis.generic.client.api.gui;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/gui/DataSetUploadClientServingServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/gui/DataSetUploadClientServingServlet.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
index aca95513576a3e1534db689c2db77343a3d206f8..82bf80fb30c71e03fadc2ae9af06fa33a37cd2af 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/gui/DataSetUploadClientServingServlet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.generic.server.api.gui;
+package ch.systemsx.cisd.openbis.generic.client.api.gui;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;