diff --git a/artefact/cpds/activities.json.php b/activities.json.php
similarity index 100%
rename from artefact/cpds/activities.json.php
rename to activities.json.php
diff --git a/artefact/cpds/blocktype/cpds/lang/en.utf8/blocktype.cpds.php b/blocktype/cpds/lang/en.utf8/blocktype.cpds.php
similarity index 100%
rename from artefact/cpds/blocktype/cpds/lang/en.utf8/blocktype.cpds.php
rename to blocktype/cpds/lang/en.utf8/blocktype.cpds.php
diff --git a/artefact/cpds/blocktype/cpds/lang/fr.utf8/blocktype.cpds.php b/blocktype/cpds/lang/fr.utf8/blocktype.cpds.php
similarity index 100%
rename from artefact/cpds/blocktype/cpds/lang/fr.utf8/blocktype.cpds.php
rename to blocktype/cpds/lang/fr.utf8/blocktype.cpds.php
diff --git a/artefact/cpds/blocktype/cpds/lib.php b/blocktype/cpds/lib.php
similarity index 100%
rename from artefact/cpds/blocktype/cpds/lib.php
rename to blocktype/cpds/lib.php
diff --git a/artefact/cpds/blocktype/cpds/theme/raw/content.tpl b/blocktype/cpds/theme/raw/content.tpl
similarity index 100%
rename from artefact/cpds/blocktype/cpds/theme/raw/content.tpl
rename to blocktype/cpds/theme/raw/content.tpl
diff --git a/artefact/cpds/blocktype/cpds/theme/raw/static/images/thumb.png b/blocktype/cpds/theme/raw/static/images/thumb.png
similarity index 100%
rename from artefact/cpds/blocktype/cpds/theme/raw/static/images/thumb.png
rename to blocktype/cpds/theme/raw/static/images/thumb.png
diff --git a/artefact/cpds/blocktype/cpds/version.php b/blocktype/cpds/version.php
similarity index 100%
rename from artefact/cpds/blocktype/cpds/version.php
rename to blocktype/cpds/version.php
diff --git a/artefact/cpds/cpd.php b/cpd.php
similarity index 100%
rename from artefact/cpds/cpd.php
rename to cpd.php
diff --git a/artefact/cpds/cpds.json.php b/cpds.json.php
similarity index 100%
rename from artefact/cpds/cpds.json.php
rename to cpds.json.php
diff --git a/artefact/cpds/db/install.xml b/db/install.xml
similarity index 100%
rename from artefact/cpds/db/install.xml
rename to db/install.xml
diff --git a/artefact/cpds/db/upgrade.php b/db/upgrade.php
similarity index 100%
rename from artefact/cpds/db/upgrade.php
rename to db/upgrade.php
diff --git a/artefact/cpds/delete/activity.php b/delete/activity.php
similarity index 100%
rename from artefact/cpds/delete/activity.php
rename to delete/activity.php
diff --git a/artefact/cpds/delete/index.php b/delete/index.php
similarity index 100%
rename from artefact/cpds/delete/index.php
rename to delete/index.php
diff --git a/artefact/cpds/edit/activity.php b/edit/activity.php
similarity index 100%
rename from artefact/cpds/edit/activity.php
rename to edit/activity.php
diff --git a/artefact/cpds/edit/index.php b/edit/index.php
similarity index 100%
rename from artefact/cpds/edit/index.php
rename to edit/index.php
diff --git a/artefact/cpds/export/html/lib.php b/export/html/lib.php
similarity index 100%
rename from artefact/cpds/export/html/lib.php
rename to export/html/lib.php
diff --git a/artefact/cpds/export/html/theme/raw/summary.tpl b/export/html/theme/raw/summary.tpl
similarity index 100%
rename from artefact/cpds/export/html/theme/raw/summary.tpl
rename to export/html/theme/raw/summary.tpl
diff --git a/artefact/cpds/export/leap/lib.php b/export/leap/lib.php
similarity index 100%
rename from artefact/cpds/export/leap/lib.php
rename to export/leap/lib.php
diff --git a/artefact/cpds/export/leap/theme/raw/cpd.tpl b/export/leap/theme/raw/cpd.tpl
similarity index 100%
rename from artefact/cpds/export/leap/theme/raw/cpd.tpl
rename to export/leap/theme/raw/cpd.tpl
diff --git a/artefact/cpds/import/leap/lib.php b/import/leap/lib.php
similarity index 100%
rename from artefact/cpds/import/leap/lib.php
rename to import/leap/lib.php
diff --git a/artefact/cpds/index.php b/index.php
similarity index 100%
rename from artefact/cpds/index.php
rename to index.php
diff --git a/artefact/cpds/lang/en.utf8/artefact.cpds.php b/lang/en.utf8/artefact.cpds.php
similarity index 100%
rename from artefact/cpds/lang/en.utf8/artefact.cpds.php
rename to lang/en.utf8/artefact.cpds.php
diff --git a/artefact/cpds/lang/en.utf8/help/pages/index.html b/lang/en.utf8/help/pages/index.html
similarity index 100%
rename from artefact/cpds/lang/en.utf8/help/pages/index.html
rename to lang/en.utf8/help/pages/index.html
diff --git a/artefact/cpds/lang/fr.utf8/artefact.cpds.php b/lang/fr.utf8/artefact.cpds.php
similarity index 100%
rename from artefact/cpds/lang/fr.utf8/artefact.cpds.php
rename to lang/fr.utf8/artefact.cpds.php
diff --git a/artefact/cpds/lib.php b/lib.php
similarity index 100%
rename from artefact/cpds/lib.php
rename to lib.php
diff --git a/artefact/cpds/new.php b/new.php
similarity index 100%
rename from artefact/cpds/new.php
rename to new.php
diff --git a/artefact/cpds/theme/fresh/static/style/style.css b/theme/fresh/static/style/style.css
similarity index 100%
rename from artefact/cpds/theme/fresh/static/style/style.css
rename to theme/fresh/static/style/style.css
diff --git a/artefact/cpds/theme/raw/activitieslist.tpl b/theme/raw/activitieslist.tpl
similarity index 100%
rename from artefact/cpds/theme/raw/activitieslist.tpl
rename to theme/raw/activitieslist.tpl
diff --git a/artefact/cpds/theme/raw/activityrows.tpl b/theme/raw/activityrows.tpl
similarity index 100%
rename from artefact/cpds/theme/raw/activityrows.tpl
rename to theme/raw/activityrows.tpl
diff --git a/artefact/cpds/theme/raw/artefactchooser-element.tpl b/theme/raw/artefactchooser-element.tpl
similarity index 100%
rename from artefact/cpds/theme/raw/artefactchooser-element.tpl
rename to theme/raw/artefactchooser-element.tpl
diff --git a/artefact/cpds/theme/raw/cpd.tpl b/theme/raw/cpd.tpl
similarity index 100%
rename from artefact/cpds/theme/raw/cpd.tpl
rename to theme/raw/cpd.tpl
diff --git a/artefact/cpds/theme/raw/cpds.tpl b/theme/raw/cpds.tpl
similarity index 100%
rename from artefact/cpds/theme/raw/cpds.tpl
rename to theme/raw/cpds.tpl
diff --git a/artefact/cpds/theme/raw/cpdslist.tpl b/theme/raw/cpdslist.tpl
similarity index 100%
rename from artefact/cpds/theme/raw/cpdslist.tpl
rename to theme/raw/cpdslist.tpl
diff --git a/artefact/cpds/theme/raw/delete.tpl b/theme/raw/delete.tpl
similarity index 100%
rename from artefact/cpds/theme/raw/delete.tpl
rename to theme/raw/delete.tpl
diff --git a/artefact/cpds/theme/raw/edit.tpl b/theme/raw/edit.tpl
similarity index 100%
rename from artefact/cpds/theme/raw/edit.tpl
rename to theme/raw/edit.tpl
diff --git a/artefact/cpds/theme/raw/index.tpl b/theme/raw/index.tpl
similarity index 100%
rename from artefact/cpds/theme/raw/index.tpl
rename to theme/raw/index.tpl
diff --git a/artefact/cpds/theme/raw/new.tpl b/theme/raw/new.tpl
similarity index 100%
rename from artefact/cpds/theme/raw/new.tpl
rename to theme/raw/new.tpl
diff --git a/artefact/cpds/theme/raw/static/images/cpd.png b/theme/raw/static/images/cpd.png
similarity index 100%
rename from artefact/cpds/theme/raw/static/images/cpd.png
rename to theme/raw/static/images/cpd.png
diff --git a/artefact/cpds/theme/raw/static/images/cpdactivity.png b/theme/raw/static/images/cpdactivity.png
similarity index 100%
rename from artefact/cpds/theme/raw/static/images/cpdactivity.png
rename to theme/raw/static/images/cpdactivity.png
diff --git a/artefact/cpds/theme/raw/static/style/style.css b/theme/raw/static/style/style.css
similarity index 100%
rename from artefact/cpds/theme/raw/static/style/style.css
rename to theme/raw/static/style/style.css
diff --git a/artefact/cpds/theme/raw/viewcpd.tpl b/theme/raw/viewcpd.tpl
similarity index 100%
rename from artefact/cpds/theme/raw/viewcpd.tpl
rename to theme/raw/viewcpd.tpl
diff --git a/artefact/cpds/version.php b/version.php
similarity index 100%
rename from artefact/cpds/version.php
rename to version.php
diff --git a/artefact/cpds/viewactivities.json.php b/viewactivities.json.php
similarity index 100%
rename from artefact/cpds/viewactivities.json.php
rename to viewactivities.json.php