diff --git a/deep_sequencing_unit/source/html/downloader/body-style.css b/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/body-style.css
similarity index 100%
rename from deep_sequencing_unit/source/html/downloader/body-style.css
rename to deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/body-style.css
diff --git a/deep_sequencing_unit/source/html/downloader/button.css b/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/button.css
similarity index 100%
rename from deep_sequencing_unit/source/html/downloader/button.css
rename to deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/button.css
diff --git a/deep_sequencing_unit/source/html/downloader/d3.js b/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/d3.js
similarity index 100%
rename from deep_sequencing_unit/source/html/downloader/d3.js
rename to deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/d3.js
diff --git a/deep_sequencing_unit/source/html/downloader/d3.layout.js b/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/d3.layout.js
similarity index 100%
rename from deep_sequencing_unit/source/html/downloader/d3.layout.js
rename to deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/d3.layout.js
diff --git a/deep_sequencing_unit/source/html/downloader/d3.time.js b/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/d3.time.js
similarity index 100%
rename from deep_sequencing_unit/source/html/downloader/d3.time.js
rename to deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/d3.time.js
diff --git a/deep_sequencing_unit/source/html/downloader/images/openBIS_Logo.svg b/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/images/openBIS_Logo.svg
similarity index 100%
rename from deep_sequencing_unit/source/html/downloader/images/openBIS_Logo.svg
rename to deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/images/openBIS_Logo.svg
diff --git a/deep_sequencing_unit/source/html/downloader/images/sprite.png b/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/images/sprite.png
similarity index 100%
rename from deep_sequencing_unit/source/html/downloader/images/sprite.png
rename to deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/images/sprite.png
diff --git a/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/index.html b/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..f7fb7d9adfb1e711b1ad3947c20f488a214ced42
--- /dev/null
+++ b/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <meta HTTP-EQUIV="REFRESH" content="0; url=openbis-dsu-downloader.html">
+</head>
+<body>
+</body>
+</html>
diff --git a/deep_sequencing_unit/source/html/downloader/openbis-dsu-downloader.html b/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/openbis-dsu-downloader.html
similarity index 99%
rename from deep_sequencing_unit/source/html/downloader/openbis-dsu-downloader.html
rename to deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/openbis-dsu-downloader.html
index c3552196197fbcb6409645e555445580a31fc8f4..081ee156543d79c368ce89f8eb59d376dc204917 100644
--- a/deep_sequencing_unit/source/html/downloader/openbis-dsu-downloader.html
+++ b/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/openbis-dsu-downloader.html
@@ -21,7 +21,7 @@
<!-- <script type="text/javascript" src="/openbis/resources/js/openbis-request-cache.js"></script> -->
<script>
-dsu = new openbis_dsu('https://openbis-dsu.ethz.ch/openbis/openbis', 'https://openbis-dsu.ethz.ch/datastore_server');
+dsu = new openbis_dsu('/openbis/openbis', '/datastore_server');
//After logout the URL redirected to, just go to current URL in this case
var logouturl = $(location).attr('href');
diff --git a/deep_sequencing_unit/source/html/downloader/openbis-dsu.js b/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/openbis-dsu.js
similarity index 100%
rename from deep_sequencing_unit/source/html/downloader/openbis-dsu.js
rename to deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/openbis-dsu.js
diff --git a/deep_sequencing_unit/source/html/downloader/tree.css b/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/tree.css
similarity index 100%
rename from deep_sequencing_unit/source/html/downloader/tree.css
rename to deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/html/tree.css
diff --git a/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/plugin.properties b/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/plugin.properties
new file mode 100644
index 0000000000000000000000000000000000000000..cb40f34f644331e58c2af13a14c7ff10d778153d
--- /dev/null
+++ b/deep_sequencing_unit/source/core-plugins/downloader/1/as/webapps/downloader/plugin.properties
@@ -0,0 +1,3 @@
+# The properties file for an example webapps plugin
+# This file has no properties defined because none need to be defined.
+webapp-folder = html
diff --git a/deep_sequencing_unit/source/html/laneStatistics/html/d3.layout.js b/deep_sequencing_unit/source/core-plugins/laneStatistics/1/as/webapps/laneStatistics/html/d3.layout.js
similarity index 100%
rename from deep_sequencing_unit/source/html/laneStatistics/html/d3.layout.js
rename to deep_sequencing_unit/source/core-plugins/laneStatistics/1/as/webapps/laneStatistics/html/d3.layout.js
diff --git a/deep_sequencing_unit/source/html/laneStatistics/html/d3.v3.min.js b/deep_sequencing_unit/source/core-plugins/laneStatistics/1/as/webapps/laneStatistics/html/d3.v3.min.js
similarity index 100%
rename from deep_sequencing_unit/source/html/laneStatistics/html/d3.v3.min.js
rename to deep_sequencing_unit/source/core-plugins/laneStatistics/1/as/webapps/laneStatistics/html/d3.v3.min.js
diff --git a/deep_sequencing_unit/source/html/laneStatistics/html/index.html b/deep_sequencing_unit/source/core-plugins/laneStatistics/1/as/webapps/laneStatistics/html/index.html
similarity index 100%
rename from deep_sequencing_unit/source/html/laneStatistics/html/index.html
rename to deep_sequencing_unit/source/core-plugins/laneStatistics/1/as/webapps/laneStatistics/html/index.html
diff --git a/deep_sequencing_unit/source/html/laneStatistics/html/openbis-dsu.js b/deep_sequencing_unit/source/core-plugins/laneStatistics/1/as/webapps/laneStatistics/html/openbis-dsu.js
similarity index 100%
rename from deep_sequencing_unit/source/html/laneStatistics/html/openbis-dsu.js
rename to deep_sequencing_unit/source/core-plugins/laneStatistics/1/as/webapps/laneStatistics/html/openbis-dsu.js
diff --git a/deep_sequencing_unit/source/html/laneStatistics/html/pie.js b/deep_sequencing_unit/source/core-plugins/laneStatistics/1/as/webapps/laneStatistics/html/pie.js
similarity index 100%
rename from deep_sequencing_unit/source/html/laneStatistics/html/pie.js
rename to deep_sequencing_unit/source/core-plugins/laneStatistics/1/as/webapps/laneStatistics/html/pie.js
diff --git a/deep_sequencing_unit/source/html/laneStatistics/plugin.properties b/deep_sequencing_unit/source/core-plugins/laneStatistics/1/as/webapps/laneStatistics/plugin.properties
similarity index 100%
rename from deep_sequencing_unit/source/html/laneStatistics/plugin.properties
rename to deep_sequencing_unit/source/core-plugins/laneStatistics/1/as/webapps/laneStatistics/plugin.properties