diff --git a/app/models/exported_plan.rb b/app/models/exported_plan.rb
index e1b18fb..eb57e5c 100644
--- a/app/models/exported_plan.rb
+++ b/app/models/exported_plan.rb
@@ -16,17 +16,17 @@
   # Store settings with the exported plan so it can be recreated later
   # if necessary (otherwise the settings associated with the plan at a
   # given time can be lost)
-  has_settings :export, class_name: 'Settings::Dmptemplate' do |s|
-    s.key :export, defaults: Settings::Dmptemplate::DEFAULT_SETTINGS
+  has_settings :export, class_name: 'Settings::Template' do |s|
+    s.key :export, defaults: Settings::Template::DEFAULT_SETTINGS
   end
 
 # TODO: Consider removing the accessor methods, they add no value. The view/controller could
 #       just access the value directly from the project/plan: exported_plan.plan.project.title
 
-  # Getters to match Settings::Dmptemplate::VALID_ADMIN_FIELDS
+  # Getters to match Settings::Template::VALID_ADMIN_FIELDS
   def project_name
     name = self.plan.project.title
-    name += " - #{self.plan.title}" if self.plan.project.dmptemplate.phases.count > 1
+    name += " - #{self.plan.title}" if self.plan.project.template.phases.count > 1
     name
   end
 
@@ -51,7 +51,7 @@
   end
 
   def funder
-    org = self.plan.project.dmptemplate.try(:organisation)
+    org = self.plan.project.template.try(:organisation)
     org.name if org.present? && org.organisation_type.try(:name) == constant("organisation_types.funder")
   end
 
diff --git a/app/models/file_upload.rb b/app/models/file_upload.rb
deleted file mode 100644
index eef1ca3..0000000
--- a/app/models/file_upload.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class FileUpload < ActiveRecord::Base
-  ##
-  # Associations
-  belongs_to :file_type
-end
diff --git a/app/models/plan.rb b/app/models/plan.rb
index d1729e8..aae4795 100644
--- a/app/models/plan.rb
+++ b/app/models/plan.rb
@@ -8,6 +8,7 @@
   has_many :answers
   has_many :notes, through: :answers
   has_many :users, through: :roles
+  has_many :exported_plans
 
   ##
   # Possibly needed for active_admin
@@ -15,7 +16,7 @@
 	attr_accessible :locked, :project_id, :version_id, :version, :plan_sections, 
                   :exported_plans, :project, :title, :template, :grant_number,
                   :identifier, :principal_investigator, :principal_investigator_identifier,
-                  :description, :data_contact, :funder_name, :visibility,
+                  :description, :data_contact, :funder_name, :visibility, :exported_plans,
                   :as => [:default, :admin]
 
   # public is a Ruby keyword so using publicly
diff --git a/app/models/user.rb b/app/models/user.rb
index 1a3df5c..f0aec25 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -16,6 +16,7 @@
   belongs_to :org
   has_many :answers
   has_many :notes
+  has_many :exported_plans
   has_many :roles, dependent: :destroy
   has_many :projects, through: :roles do
     def filter(query)
diff --git a/test/unit/exported_plan_test.rb b/test/unit/exported_plan_test.rb
index 00ef9cb..40bb56e 100644
--- a/test/unit/exported_plan_test.rb
+++ b/test/unit/exported_plan_test.rb
@@ -5,19 +5,10 @@
   setup do
     @user = User.last
     
-    # generate a template and plan
-    template = generate_complete_template
+    @plan = plan_scaffold
     
-    project = Project.new({
-      title: 'Test Project',
-      organisation: @user.organisation
-    })
-    project.dmptemplate = template
-    project.save!
-    
-    @plan = project.plans.first
-    
-    @exported = ExportedPlan.create(user: @user, plan: @plan, format: ExportedPlan::VALID_FORMATS.first)
+    @exported = ExportedPlan.create(user: @user, plan: @plan, 
+                                    format: ExportedPlan::VALID_FORMATS.first)
   end
 
   # ---------------------------------------------------
diff --git a/test/unit/helpers/answers_helper_test.rb b/test/unit/helpers/answers_helper_test.rb
deleted file mode 100644
index ba3e2d9..0000000
--- a/test/unit/helpers/answers_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class AnswersHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/dmptemplates_helper_test.rb b/test/unit/helpers/dmptemplates_helper_test.rb
deleted file mode 100644
index 7703fda..0000000
--- a/test/unit/helpers/dmptemplates_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class DmptemplatesHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/file_types_helper_test.rb b/test/unit/helpers/file_types_helper_test.rb
deleted file mode 100644
index 02fd16e..0000000
--- a/test/unit/helpers/file_types_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class FileTypesHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/file_uploads_helper_test.rb b/test/unit/helpers/file_uploads_helper_test.rb
deleted file mode 100644
index d6bb15e..0000000
--- a/test/unit/helpers/file_uploads_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class FileUploadsHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/guidances_helper_test.rb b/test/unit/helpers/guidances_helper_test.rb
deleted file mode 100644
index 397b066..0000000
--- a/test/unit/helpers/guidances_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class GuidancesHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/home_helper_test.rb b/test/unit/helpers/home_helper_test.rb
deleted file mode 100644
index 4e72d63..0000000
--- a/test/unit/helpers/home_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class HomeHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/organisation_types_helper_test.rb b/test/unit/helpers/organisation_types_helper_test.rb
deleted file mode 100644
index e355bde..0000000
--- a/test/unit/helpers/organisation_types_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class OrganisationTypesHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/organisations_helper_test.rb b/test/unit/helpers/organisations_helper_test.rb
deleted file mode 100644
index ba9c1df..0000000
--- a/test/unit/helpers/organisations_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class OrganisationsHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/pages_helper_test.rb b/test/unit/helpers/pages_helper_test.rb
deleted file mode 100644
index ec7d95a..0000000
--- a/test/unit/helpers/pages_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class PagesHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/phases_helper_test.rb b/test/unit/helpers/phases_helper_test.rb
deleted file mode 100644
index 5ea83b2..0000000
--- a/test/unit/helpers/phases_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class PhasesHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/plan_sections_helper_test.rb b/test/unit/helpers/plan_sections_helper_test.rb
deleted file mode 100644
index b196349..0000000
--- a/test/unit/helpers/plan_sections_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class PlanSectionsHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/plans_helper_test.rb b/test/unit/helpers/plans_helper_test.rb
deleted file mode 100644
index e440041..0000000
--- a/test/unit/helpers/plans_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class PlansHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/project_groups_helper_test.rb b/test/unit/helpers/project_groups_helper_test.rb
deleted file mode 100644
index 00536a7..0000000
--- a/test/unit/helpers/project_groups_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class ProjectGroupsHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/project_partners_helper_test.rb b/test/unit/helpers/project_partners_helper_test.rb
deleted file mode 100644
index e34ac3f..0000000
--- a/test/unit/helpers/project_partners_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class ProjectPartnersHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/projects_helper_test.rb b/test/unit/helpers/projects_helper_test.rb
deleted file mode 100644
index 2e6d5a7..0000000
--- a/test/unit/helpers/projects_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class ProjectsHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/question_themes_helper_test.rb b/test/unit/helpers/question_themes_helper_test.rb
deleted file mode 100644
index 96a1dc7..0000000
--- a/test/unit/helpers/question_themes_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class QuestionThemesHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/questions_helper_test.rb b/test/unit/helpers/questions_helper_test.rb
deleted file mode 100644
index 0c122f5..0000000
--- a/test/unit/helpers/questions_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class QuestionsHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/sections_helper_test.rb b/test/unit/helpers/sections_helper_test.rb
deleted file mode 100644
index aff16de..0000000
--- a/test/unit/helpers/sections_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class SectionsHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/themes_helper_test.rb b/test/unit/helpers/themes_helper_test.rb
deleted file mode 100644
index 0a5c987..0000000
--- a/test/unit/helpers/themes_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class ThemesHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/user_org_roles_helper_test.rb b/test/unit/helpers/user_org_roles_helper_test.rb
deleted file mode 100644
index c02d2f2..0000000
--- a/test/unit/helpers/user_org_roles_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class UserOrgRolesHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/user_role_types_helper_test.rb b/test/unit/helpers/user_role_types_helper_test.rb
deleted file mode 100644
index a1c8e04..0000000
--- a/test/unit/helpers/user_role_types_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class UserRoleTypesHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/user_statuses_helper_test.rb b/test/unit/helpers/user_statuses_helper_test.rb
deleted file mode 100644
index 3d39852..0000000
--- a/test/unit/helpers/user_statuses_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class UserStatusesHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/user_types_helper_test.rb b/test/unit/helpers/user_types_helper_test.rb
deleted file mode 100644
index 7460858..0000000
--- a/test/unit/helpers/user_types_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class UserTypesHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/users_helper_test.rb b/test/unit/helpers/users_helper_test.rb
deleted file mode 100644
index c77b035..0000000
--- a/test/unit/helpers/users_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class UsersHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/versions_helper_test.rb b/test/unit/helpers/versions_helper_test.rb
deleted file mode 100644
index f12ea8a..0000000
--- a/test/unit/helpers/versions_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class VersionsHelperTest < ActionView::TestCase
-end