diff --git a/plasmid/source/html/yeastlabbrowser/antibody-body-style.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/antibody-body-style.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/antibody-body-style.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/antibody-body-style.css
diff --git a/plasmid/source/html/yeastlabbrowser/antibody-browser.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/antibody-browser.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/antibody-browser.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/antibody-browser.html
diff --git a/plasmid/source/html/yeastlabbrowser/bacteria-body-style.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/bacteria-body-style.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/bacteria-body-style.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/bacteria-body-style.css
diff --git a/plasmid/source/html/yeastlabbrowser/bacteria-browser.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/bacteria-browser.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/bacteria-browser.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/bacteria-browser.html
diff --git a/plasmid/source/html/yeastlabbrowser/base.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/base.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/base.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/base.css
diff --git a/plasmid/source/html/yeastlabbrowser/body-style.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/body-style.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/body-style.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/body-style.css
diff --git a/plasmid/source/html/yeastlabbrowser/buffer-body-style.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/buffer-body-style.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/buffer-body-style.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/buffer-body-style.css
diff --git a/plasmid/source/html/yeastlabbrowser/button.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/button.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/button.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/button.css
diff --git a/plasmid/source/html/yeastlabbrowser/chemical-body-style.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/chemical-body-style.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/chemical-body-style.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/chemical-body-style.css
diff --git a/plasmid/source/html/yeastlabbrowser/chemical-browser.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/chemical-browser.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/chemical-browser.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/chemical-browser.html
diff --git a/plasmid/source/html/yeastlabbrowser/common.js b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/common.js
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/common.js
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/common.js
diff --git a/plasmid/source/html/yeastlabbrowser/d3.js b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/d3.js
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/d3.js
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/d3.js
diff --git a/plasmid/source/html/yeastlabbrowser/d3.layout.js b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/d3.layout.js
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/d3.layout.js
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/d3.layout.js
diff --git a/plasmid/source/html/yeastlabbrowser/d3.time.js b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/d3.time.js
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/d3.time.js
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/d3.time.js
diff --git a/plasmid/source/html/yeastlabbrowser/d3.tsv.js b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/d3.tsv.js
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/d3.tsv.js
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/d3.tsv.js
diff --git a/plasmid/source/html/yeastlabbrowser/enzyme-body-style.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/enzyme-body-style.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/enzyme-body-style.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/enzyme-body-style.css
diff --git a/plasmid/source/html/yeastlabbrowser/enzyme-browser.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/enzyme-browser.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/enzyme-browser.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/enzyme-browser.html
diff --git a/plasmid/source/html/yeastlabbrowser/general_protocol-body-style.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/general_protocol-body-style.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/general_protocol-body-style.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/general_protocol-body-style.css
diff --git a/plasmid/source/html/yeastlabbrowser/general_protocol-browser.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/general_protocol-browser.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/general_protocol-browser.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/general_protocol-browser.html
diff --git a/plasmid/source/html/yeastlabbrowser/images/openBIS_Logo.png b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/images/openBIS_Logo.png
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/images/openBIS_Logo.png
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/images/openBIS_Logo.png
diff --git a/plasmid/source/html/yeastlabbrowser/images/openBIS_Logo.svg b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/images/openBIS_Logo.svg
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/images/openBIS_Logo.svg
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/images/openBIS_Logo.svg
diff --git a/plasmid/source/html/yeastlabbrowser/infra.js b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/infra.js
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/infra.js
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/infra.js
diff --git a/plasmid/source/html/yeastlabbrowser/jquery.dataTables.js b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/jquery.dataTables.js
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/jquery.dataTables.js
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/jquery.dataTables.js
diff --git a/plasmid/source/html/yeastlabbrowser/jquery.fixheadertable.js b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/jquery.fixheadertable.js
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/jquery.fixheadertable.js
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/jquery.fixheadertable.js
diff --git a/plasmid/source/html/yeastlabbrowser/media-body-style.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/media-body-style.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/media-body-style.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/media-body-style.css
diff --git a/plasmid/source/html/yeastlabbrowser/media-browser.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/media-browser.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/media-browser.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/media-browser.html
diff --git a/plasmid/source/html/yeastlabbrowser/oligo-body-style.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/oligo-body-style.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/oligo-body-style.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/oligo-body-style.css
diff --git a/plasmid/source/html/yeastlabbrowser/oligo-browser.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/oligo-browser.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/oligo-browser.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/oligo-browser.html
diff --git a/plasmid/source/html/yeastlabbrowser/oligos-browser b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/oligos-browser
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/oligos-browser
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/oligos-browser
diff --git a/plasmid/source/html/yeastlabbrowser/pcr-body-style.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/pcr-body-style.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/pcr-body-style.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/pcr-body-style.css
diff --git a/plasmid/source/html/yeastlabbrowser/pcr-browser.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/pcr-browser.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/pcr-browser.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/pcr-browser.html
diff --git a/plasmid/source/html/yeastlabbrowser/plasmid-body-style.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/plasmid-body-style.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/plasmid-body-style.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/plasmid-body-style.css
diff --git a/plasmid/source/html/yeastlabbrowser/plasmid-browser.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/plasmid-browser.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/plasmid-browser.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/plasmid-browser.html
diff --git a/plasmid/source/html/yeastlabbrowser/reset-min.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/reset-min.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/reset-min.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/reset-min.css
diff --git a/plasmid/source/html/yeastlabbrowser/search-body-style.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/search-body-style.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/search-body-style.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/search-body-style.css
diff --git a/plasmid/source/html/yeastlabbrowser/search-browser.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/search-browser.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/search-browser.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/search-browser.html
diff --git a/plasmid/source/html/yeastlabbrowser/simplified-yeast-browser.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/simplified-yeast-browser.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/simplified-yeast-browser.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/simplified-yeast-browser.html
diff --git a/plasmid/source/html/yeastlabbrowser/solutions_buffers-browser.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/solutions_buffers-browser.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/solutions_buffers-browser.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/solutions_buffers-browser.html
diff --git a/plasmid/source/html/yeastlabbrowser/webapp.js b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/webapp.js
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/webapp.js
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/webapp.js
diff --git a/plasmid/source/html/yeastlabbrowser/western_blotting-body-style.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/western_blotting-body-style.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/western_blotting-body-style.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/western_blotting-body-style.css
diff --git a/plasmid/source/html/yeastlabbrowser/western_blotting-browser.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/western_blotting-browser.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/western_blotting-browser.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/western_blotting-browser.html
diff --git a/plasmid/source/html/yeastlabbrowser/yeast-body-style-modified.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/yeast-body-style-modified.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/yeast-body-style-modified.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/yeast-body-style-modified.css
diff --git a/plasmid/source/html/yeastlabbrowser/yeast-body-style.css b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/yeast-body-style.css
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/yeast-body-style.css
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/yeast-body-style.css
diff --git a/plasmid/source/html/yeastlabbrowser/yeast-browser-d3table.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/yeast-browser-d3table.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/yeast-browser-d3table.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/yeast-browser-d3table.html
diff --git a/plasmid/source/html/yeastlabbrowser/yeast-browser-fixedheader.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/yeast-browser-fixedheader.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/yeast-browser-fixedheader.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/yeast-browser-fixedheader.html
diff --git a/plasmid/source/html/yeastlabbrowser/yeast-browser-tables-redone.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/yeast-browser-tables-redone.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/yeast-browser-tables-redone.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/yeast-browser-tables-redone.html
diff --git a/plasmid/source/html/yeastlabbrowser/yeast-browser.html b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/yeast-browser.html
similarity index 100%
rename from plasmid/source/html/yeastlabbrowser/yeast-browser.html
rename to plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/html/yeast-browser.html
diff --git a/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/plugin.properties b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/plugin.properties
new file mode 100644
index 0000000000000000000000000000000000000000..9a94ff03bf056593809e33328f4b5346335829e1
--- /dev/null
+++ b/plasmid/source/core-plugins/yeastlabbrowser/1/as/webapps/yeastlabbrowser/plugin.properties
@@ -0,0 +1 @@
+webapp-folder = html