diff --git a/public/modules/forms/controllers/admin-form.client.controller.js b/public/modules/forms/admin/controllers/admin-form.client.controller.js
similarity index 100%
rename from public/modules/forms/controllers/admin-form.client.controller.js
rename to public/modules/forms/admin/controllers/admin-form.client.controller.js
diff --git a/public/modules/forms/controllers/list-forms.client.controller.js b/public/modules/forms/admin/controllers/list-forms.client.controller.js
similarity index 100%
rename from public/modules/forms/controllers/list-forms.client.controller.js
rename to public/modules/forms/admin/controllers/list-forms.client.controller.js
diff --git a/public/modules/forms/directives/auto-save.client.directive.js b/public/modules/forms/admin/directives/auto-save.client.directive.js
similarity index 100%
rename from public/modules/forms/directives/auto-save.client.directive.js
rename to public/modules/forms/admin/directives/auto-save.client.directive.js
diff --git a/public/modules/forms/directives/configure-form.client.directive.js b/public/modules/forms/admin/directives/configure-form.client.directive.js
similarity index 100%
rename from public/modules/forms/directives/configure-form.client.directive.js
rename to public/modules/forms/admin/directives/configure-form.client.directive.js
diff --git a/public/modules/forms/directives/edit-form.client.directive.js b/public/modules/forms/admin/directives/edit-form.client.directive.js
similarity index 100%
rename from public/modules/forms/directives/edit-form.client.directive.js
rename to public/modules/forms/admin/directives/edit-form.client.directive.js
diff --git a/public/modules/forms/directives/edit-submissions-form.client.directive.js b/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js
similarity index 100%
rename from public/modules/forms/directives/edit-submissions-form.client.directive.js
rename to public/modules/forms/admin/directives/edit-submissions-form.client.directive.js
diff --git a/public/modules/forms/services/submissions.client.service.js b/public/modules/forms/admin/services/submissions.client.service.js
similarity index 100%
rename from public/modules/forms/services/submissions.client.service.js
rename to public/modules/forms/admin/services/submissions.client.service.js
diff --git a/public/modules/forms/views/admin-form.client.view.html b/public/modules/forms/admin/views/admin-form.client.view.html
similarity index 100%
rename from public/modules/forms/views/admin-form.client.view.html
rename to public/modules/forms/admin/views/admin-form.client.view.html
diff --git a/public/modules/forms/views/adminTabs/analyze.html b/public/modules/forms/admin/views/adminTabs/analyze.html
similarity index 100%
rename from public/modules/forms/views/adminTabs/analyze.html
rename to public/modules/forms/admin/views/adminTabs/analyze.html
diff --git a/public/modules/forms/views/adminTabs/configure.html b/public/modules/forms/admin/views/adminTabs/configure.html
similarity index 100%
rename from public/modules/forms/views/adminTabs/configure.html
rename to public/modules/forms/admin/views/adminTabs/configure.html
diff --git a/public/modules/forms/views/adminTabs/create.html b/public/modules/forms/admin/views/adminTabs/create.html
similarity index 100%
rename from public/modules/forms/views/adminTabs/create.html
rename to public/modules/forms/admin/views/adminTabs/create.html
diff --git a/public/modules/forms/views/adminTabs/design.html b/public/modules/forms/admin/views/adminTabs/design.html
similarity index 100%
rename from public/modules/forms/views/adminTabs/design.html
rename to public/modules/forms/admin/views/adminTabs/design.html
diff --git a/public/modules/forms/views/directiveViews/cgBusy/update-form-message-TypeA.html b/public/modules/forms/admin/views/directiveViews/cgBusy/update-form-message-TypeA.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/cgBusy/update-form-message-TypeA.html
rename to public/modules/forms/admin/views/directiveViews/cgBusy/update-form-message-TypeA.html
diff --git a/public/modules/forms/views/directiveViews/cgBusy/update-form-message-TypeB.html b/public/modules/forms/admin/views/directiveViews/cgBusy/update-form-message-TypeB.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/cgBusy/update-form-message-TypeB.html
rename to public/modules/forms/admin/views/directiveViews/cgBusy/update-form-message-TypeB.html
diff --git a/public/modules/forms/views/directiveViews/form/configure-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/form/configure-form.client.view.html
rename to public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html
diff --git a/public/modules/forms/views/directiveViews/form/edit-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/form/edit-form.client.view.html
rename to public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html
diff --git a/public/modules/forms/views/directiveViews/form/edit-submissions-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/form/edit-submissions-form.client.view.html
rename to public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
diff --git a/public/modules/forms/views/list-forms.client.view.html b/public/modules/forms/admin/views/list-forms.client.view.html
similarity index 100%
rename from public/modules/forms/views/list-forms.client.view.html
rename to public/modules/forms/admin/views/list-forms.client.view.html
diff --git a/public/modules/forms/controllers/submit-form.client.controller.js b/public/modules/forms/base/controllers/submit-form.client.controller.js
similarity index 100%
rename from public/modules/forms/controllers/submit-form.client.controller.js
rename to public/modules/forms/base/controllers/submit-form.client.controller.js
diff --git a/public/modules/forms/css/form.css b/public/modules/forms/base/css/form.css
similarity index 100%
rename from public/modules/forms/css/form.css
rename to public/modules/forms/base/css/form.css
diff --git a/public/modules/forms/directives/field-icon.client.directive.js b/public/modules/forms/base/directives/field-icon.client.directive.js
similarity index 100%
rename from public/modules/forms/directives/field-icon.client.directive.js
rename to public/modules/forms/base/directives/field-icon.client.directive.js
diff --git a/public/modules/forms/directives/field.client.directive.js b/public/modules/forms/base/directives/field.client.directive.js
similarity index 100%
rename from public/modules/forms/directives/field.client.directive.js
rename to public/modules/forms/base/directives/field.client.directive.js
diff --git a/public/modules/forms/directives/on-enter-key.client.directive.js b/public/modules/forms/base/directives/on-enter-key.client.directive.js
similarity index 100%
rename from public/modules/forms/directives/on-enter-key.client.directive.js
rename to public/modules/forms/base/directives/on-enter-key.client.directive.js
diff --git a/public/modules/forms/directives/on-finish-render.client.directive.js b/public/modules/forms/base/directives/on-finish-render.client.directive.js
similarity index 100%
rename from public/modules/forms/directives/on-finish-render.client.directive.js
rename to public/modules/forms/base/directives/on-finish-render.client.directive.js
diff --git a/public/modules/forms/directives/submit-form.client.directive.js b/public/modules/forms/base/directives/submit-form.client.directive.js
similarity index 100%
rename from public/modules/forms/directives/submit-form.client.directive.js
rename to public/modules/forms/base/directives/submit-form.client.directive.js
diff --git a/public/modules/forms/services/current-form.client.service.js b/public/modules/forms/base/services/current-form.client.service.js
similarity index 100%
rename from public/modules/forms/services/current-form.client.service.js
rename to public/modules/forms/base/services/current-form.client.service.js
diff --git a/public/modules/forms/services/form-fields.client.service.js b/public/modules/forms/base/services/form-fields.client.service.js
similarity index 100%
rename from public/modules/forms/services/form-fields.client.service.js
rename to public/modules/forms/base/services/form-fields.client.service.js
diff --git a/public/modules/forms/services/forms.client.service.js b/public/modules/forms/base/services/forms.client.service.js
similarity index 100%
rename from public/modules/forms/services/forms.client.service.js
rename to public/modules/forms/base/services/forms.client.service.js
diff --git a/public/modules/forms/services/time-counter.client.service.js b/public/modules/forms/base/services/time-counter.client.service.js
similarity index 100%
rename from public/modules/forms/services/time-counter.client.service.js
rename to public/modules/forms/base/services/time-counter.client.service.js
diff --git a/public/modules/forms/views/directiveViews/entryPage/startPage.html b/public/modules/forms/base/views/directiveViews/entryPage/startPage.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/entryPage/startPage.html
rename to public/modules/forms/base/views/directiveViews/entryPage/startPage.html
diff --git a/public/modules/forms/views/directiveViews/field/date.html b/public/modules/forms/base/views/directiveViews/field/date.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/field/date.html
rename to public/modules/forms/base/views/directiveViews/field/date.html
diff --git a/public/modules/forms/views/directiveViews/field/dropdown.html b/public/modules/forms/base/views/directiveViews/field/dropdown.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/field/dropdown.html
rename to public/modules/forms/base/views/directiveViews/field/dropdown.html
diff --git a/public/modules/forms/views/directiveViews/field/file.html b/public/modules/forms/base/views/directiveViews/field/file.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/field/file.html
rename to public/modules/forms/base/views/directiveViews/field/file.html
diff --git a/public/modules/forms/views/directiveViews/field/hidden.html b/public/modules/forms/base/views/directiveViews/field/hidden.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/field/hidden.html
rename to public/modules/forms/base/views/directiveViews/field/hidden.html
diff --git a/public/modules/forms/views/directiveViews/field/legal.html b/public/modules/forms/base/views/directiveViews/field/legal.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/field/legal.html
rename to public/modules/forms/base/views/directiveViews/field/legal.html
diff --git a/public/modules/forms/views/directiveViews/field/radio.html b/public/modules/forms/base/views/directiveViews/field/radio.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/field/radio.html
rename to public/modules/forms/base/views/directiveViews/field/radio.html
diff --git a/public/modules/forms/views/directiveViews/field/rating.html b/public/modules/forms/base/views/directiveViews/field/rating.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/field/rating.html
rename to public/modules/forms/base/views/directiveViews/field/rating.html
diff --git a/public/modules/forms/views/directiveViews/field/statement.html b/public/modules/forms/base/views/directiveViews/field/statement.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/field/statement.html
rename to public/modules/forms/base/views/directiveViews/field/statement.html
diff --git a/public/modules/forms/views/directiveViews/field/textarea.html b/public/modules/forms/base/views/directiveViews/field/textarea.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/field/textarea.html
rename to public/modules/forms/base/views/directiveViews/field/textarea.html
diff --git a/public/modules/forms/views/directiveViews/field/textfield.html b/public/modules/forms/base/views/directiveViews/field/textfield.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/field/textfield.html
rename to public/modules/forms/base/views/directiveViews/field/textfield.html
diff --git a/public/modules/forms/views/directiveViews/field/yes_no.html b/public/modules/forms/base/views/directiveViews/field/yes_no.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/field/yes_no.html
rename to public/modules/forms/base/views/directiveViews/field/yes_no.html
diff --git a/public/modules/forms/views/directiveViews/form/submit-form.client.view.html b/public/modules/forms/base/views/directiveViews/form/submit-form.client.view.html
similarity index 100%
rename from public/modules/forms/views/directiveViews/form/submit-form.client.view.html
rename to public/modules/forms/base/views/directiveViews/form/submit-form.client.view.html
diff --git a/public/modules/forms/views/submit-form.client.view.html b/public/modules/forms/base/views/submit-form.client.view.html
similarity index 100%
rename from public/modules/forms/views/submit-form.client.view.html
rename to public/modules/forms/base/views/submit-form.client.view.html