diff --git a/cfg/workflows/eprint/default.xml b/cfg/workflows/eprint/default.xml
deleted file mode 100644
index e0380a4..0000000
--- a/cfg/workflows/eprint/default.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-   <!--
-
-   Action buttons (Previous/Save/Next) can be shown "top", "bottom" or "both":
-   <stage name="type" action_buttons="both">
-     <component><field ref="type" required="yes" /></component>
-   </stage>
-
-   -->
-<!-- Extra field will just appear as part of creators -->
-<workflow xmlns="http://eprints.org/ep3/workflow" xmlns:epc="http://eprints.org/ep3/control">
-
-
-</workflow>
diff --git a/cfg/lang/en/phrases/credit.xml b/lang/en/phrases/credit.xml
similarity index 100%
rename from cfg/lang/en/phrases/credit.xml
rename to lang/en/phrases/credit.xml
diff --git a/cfg/namedsets/credit b/namedsets/credit
similarity index 100%
rename from cfg/namedsets/credit
rename to namedsets/credit
diff --git a/cfg/namedsets/credit_size b/namedsets/credit_size
similarity index 100%
rename from cfg/namedsets/credit_size
rename to namedsets/credit_size
diff --git a/lib/plugins/EPrints/MetaField/CreditRole.pm b/plugins/EPrints/MetaField/CreditRole.pm
similarity index 99%
rename from lib/plugins/EPrints/MetaField/CreditRole.pm
rename to plugins/EPrints/MetaField/CreditRole.pm
index c31f126..abfd3c9 100644
--- a/lib/plugins/EPrints/MetaField/CreditRole.pm
+++ b/plugins/EPrints/MetaField/CreditRole.pm
@@ -23,12 +23,18 @@ not done
 
 package EPrints::MetaField::CreditRole;
 
-use EPrints::MetaField::Id;
+use strict;
+use warnings;
+
 use JSON;
+use EPrints::MetaField::Id;
 
-@ISA = qw( EPrints::MetaField::Longtext );
+BEGIN
+{
+	our( @ISA );
+	@ISA = qw( EPrints::MetaField::Longtext );
+}
 
-use strict;
 
 sub allow_edit
 {
diff --git a/cfg/static/javascript/auto/96_credit_field.js b/static/javascript/auto/96_credit_field.js
similarity index 100%
rename from cfg/static/javascript/auto/96_credit_field.js
rename to static/javascript/auto/96_credit_field.js
diff --git a/cfg/static/style/auto/zzz_credit.css b/static/style/auto/zzz_credit.css
similarity index 100%
rename from cfg/static/style/auto/zzz_credit.css
rename to static/style/auto/zzz_credit.css