diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts
index 29958fe47..2ea041975 100644
--- a/dmp-frontend/src/app/app-routing.module.ts
+++ b/dmp-frontend/src/app/app-routing.module.ts
@@ -1,8 +1,8 @@
 import { UnauthorizedComponent } from './unauthorized/unauthorized.component';
-import { NgModule }             from '@angular/core';
+import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { PageNotFoundComponent }    from './not-found.component';
-import { HomepageComponent }    from './homepage/homepage.component';
+import { PageNotFoundComponent } from './not-found.component';
+import { HomepageComponent } from './homepage/homepage.component';
 import { DynamicFormComponent } from './form/dynamic-form.component';
 import { AuthGuard } from './guards/auth.guard';
 import { AppComponent } from './app.component';
@@ -11,30 +11,29 @@ import { ProjectListingComponent } from './projects/project-listing.component';
 import { DataManagementPlanListingComponent } from './dmps/dmp-listing.component';
 import { ProjectEditorComponent } from './projects/editor/project-editor.component';
 import { DataManagementPlanEditorComponent } from './dmps/editor/dmp-editor.component';
-import { DatasetEditorComponent } from './datasets_new/editor/dataset-editor.component';
-import { DatasetListingComponent } from './datasets_new/dataset-listing.component';
-import { DataManagementPlanWizardComponent } from './dmp-wizard/dmp-wizard.component';
+import { DatasetEditorComponent } from './datasets/editor/dataset-editor.component';
+import { DatasetListingComponent } from './datasets/dataset-listing.component';
 import { LoginComponent } from './login/login.component';
-
+import { DatasetWizardComponent } from './dataset-wizard/dataset-wizard.component';
 
 const appRoutes: Routes = [
-  
-  { path: 'dynamic-form/:id', component: DynamicFormComponent, canActivate: [AuthGuard] },
-  { path: 'projects', component: ProjectListingComponent, canActivate: [AuthGuard]},
-  { path: 'project/:id', component: ProjectEditorComponent, canActivate: [AuthGuard]},
-  { path: 'projects/new', component: ProjectEditorComponent, canActivate: [AuthGuard]},
-  { path: 'dmps', component: DataManagementPlanListingComponent, canActivate: [AuthGuard]},
-  { path: 'dmp/new', component: DataManagementPlanWizardComponent, canActivate: [AuthGuard]},
-  { path: 'dmp/:id', component: DataManagementPlanEditorComponent, canActivate: [AuthGuard]},
-  { path: 'dmps/new', component: DataManagementPlanEditorComponent, canActivate: [AuthGuard]},
-  { path: 'datasets', component: DatasetListingComponent, canActivate: [AuthGuard]},
-  { path: 'dataset/:id', component: DatasetEditorComponent, canActivate: [AuthGuard]},
-  { path: 'datasets/new', component: DatasetEditorComponent, canActivate: [AuthGuard]},
 
-  { path: 'login', component: LoginComponent},  
-	{ path: "unauthorized", loadChildren: './unauthorized/unauthorized.module#UnauthorizedModule' },
-  { path: 'welcome', component: HomepageComponent, canActivate: [AuthGuard]},
-  { path: '',   redirectTo: '/welcome', pathMatch: 'full' },
+  { path: 'dynamic-form/:id', component: DynamicFormComponent, canActivate: [AuthGuard] },
+  { path: 'projects', component: ProjectListingComponent, canActivate: [AuthGuard] },
+  { path: 'project/:id', component: ProjectEditorComponent, canActivate: [AuthGuard] },
+  { path: 'projects/new', component: ProjectEditorComponent, canActivate: [AuthGuard] },
+  { path: 'dmps', component: DataManagementPlanListingComponent, canActivate: [AuthGuard] },
+  { path: 'dmp/:id', component: DataManagementPlanEditorComponent, canActivate: [AuthGuard] },
+  { path: 'dmps/new', component: DataManagementPlanEditorComponent, canActivate: [AuthGuard] },
+  { path: 'datasets', component: DatasetListingComponent, canActivate: [AuthGuard] },
+  { path: 'dataset/new', component: DatasetWizardComponent, canActivate: [AuthGuard] },
+  { path: 'dataset/:id', component: DatasetEditorComponent, canActivate: [AuthGuard] },
+  { path: 'datasets/new', component: DatasetEditorComponent, canActivate: [AuthGuard] },
+
+  { path: 'login', component: LoginComponent },
+  { path: "unauthorized", loadChildren: './unauthorized/unauthorized.module#UnauthorizedModule' },
+  { path: 'welcome', component: HomepageComponent, canActivate: [AuthGuard] },
+  { path: '', redirectTo: '/welcome', pathMatch: 'full' },
 
 ];
 
@@ -42,10 +41,10 @@ const appRoutes: Routes = [
   imports: [
     RouterModule.forRoot(
       appRoutes
-      ,{ 
+      , {
         useHash: false
         //,enableTracing: true <-- debugging purposes only
-      } 
+      }
     )
   ],
   exports: [
diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts
index 2b1859583..2f7a4acd4 100644
--- a/dmp-frontend/src/app/app.module.ts
+++ b/dmp-frontend/src/app/app.module.ts
@@ -1,25 +1,13 @@
 import { UnauthorizedComponent } from './unauthorized/unauthorized.component';
 import { PaginationService } from './form/pagination/pagination-service';
-import {
-  TableOfContentsFieldComponent,
-} from './form/tableOfContents/table-of-content-field/table-of-content-field.component';
+import { TableOfContentsFieldComponent } from './form/tableOfContents/table-of-content-field/table-of-content-field.component';
 import { ProgressBarComponent } from './form/pprogress-bar/progress-bar.component';
-import {
-  TableOfContentsSectionComponent,
-} from './form/tableOfContents/table-of-content-section/table-of-content-section.component';
-import {
-  TableOfContentsGroupComponent,
-} from './form/tableOfContents/table-of-content-group/table-of-content-group.component';
-import {
-  TableOfContentsFieldSetComponent,
-} from './form/tableOfContents/table-of-content-fieldset/table-of-content-fieldset.component';
+import { TableOfContentsSectionComponent } from './form/tableOfContents/table-of-content-section/table-of-content-section.component';
+import { TableOfContentsGroupComponent } from './form/tableOfContents/table-of-content-group/table-of-content-group.component';
+import { TableOfContentsFieldSetComponent } from './form/tableOfContents/table-of-content-fieldset/table-of-content-fieldset.component';
 import { TableOfContentsComponent } from './form/tableOfContents/table-of-contents.component';
-import {
-  DynamicFieldRadioBoxComponent,
-} from './form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component';
-import {
-  DynamicFieldBooleanDecisionComponent,
-} from './form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component';
+import { DynamicFieldRadioBoxComponent } from './form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component';
+import { DynamicFieldBooleanDecisionComponent } from './form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component';
 import { AutocompleteRemoteComponent } from './form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component';
 import { DynamicFieldDropdownComponent } from './form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown';
 import { DynamicFieldCheckBoxComponent } from './form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox';
@@ -51,17 +39,17 @@ import { SharedModule } from './shared/shared.module';
 import { MaterialModule } from './shared/material/material.module';
 import { AuthService } from './services/auth/auth.service';
 import { ProjectListingComponent } from './projects/project-listing.component';
-import { DatasetListingComponent } from './datasets_new/dataset-listing.component';
 import { DashboardService } from './services/dashboard/dashboard.service';
 import { DatasetService } from './services/dataset/dataset.service';
 import { BaseHttpService } from './utilities/cite-http-service-module/base-http.service';
 import { DataManagementPlanListingComponent } from './dmps/dmp-listing.component';
 import { ProjectEditorComponent } from './projects/editor/project-editor.component';
 import { DataManagementPlanEditorComponent } from './dmps/editor/dmp-editor.component';
-import { DatasetEditorComponent } from './datasets_new/editor/dataset-editor.component';
-import { DataManagementPlanWizardComponent } from './dmp-wizard/dmp-wizard.component';
 import { LoginComponent } from './login/login.component';
 import { FigurecardComponent } from './shared/components/figurecard/figurecard.component';
+import { DatasetListingComponent } from './datasets/dataset-listing.component';
+import { DatasetEditorComponent } from './datasets/editor/dataset-editor.component';
+import { DatasetWizardComponent } from './dataset-wizard/dataset-wizard.component';
 
 
 
@@ -92,7 +80,7 @@ import { FigurecardComponent } from './shared/components/figurecard/figurecard.c
     DynamicFieldCheckBoxComponent,
     ProjectEditorComponent,
     DataManagementPlanEditorComponent,
-    DataManagementPlanWizardComponent,
+    DatasetWizardComponent,
     FigurecardComponent,
     DatasetEditorComponent
   ],
diff --git a/dmp-frontend/src/app/dmp-wizard/dmp-wizard.component.html b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html
similarity index 100%
rename from dmp-frontend/src/app/dmp-wizard/dmp-wizard.component.html
rename to dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html
diff --git a/dmp-frontend/src/app/dmp-wizard/dmp-wizard.component.scss b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.scss
similarity index 100%
rename from dmp-frontend/src/app/dmp-wizard/dmp-wizard.component.scss
rename to dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.scss
diff --git a/dmp-frontend/src/app/dmp-wizard/dmp-wizard.component.ts b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts
similarity index 88%
rename from dmp-frontend/src/app/dmp-wizard/dmp-wizard.component.ts
rename to dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts
index a8cf8c9c4..641391730 100644
--- a/dmp-frontend/src/app/dmp-wizard/dmp-wizard.component.ts
+++ b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts
@@ -5,13 +5,13 @@ import { FormGroup, Validators, FormBuilder } from "@angular/forms";
 
 
 @Component({
-  selector: 'app-dmp-wizard-component',
-  templateUrl: 'dmp-wizard.component.html',
-  styleUrls: ['./dmp-wizard.component.scss'],
+  selector: 'app-dataset-wizard-component',
+  templateUrl: 'dataset-wizard.component.html',
+  styleUrls: ['./dataset-wizard.component.scss'],
   providers: [DataManagementPlanService],
   encapsulation: ViewEncapsulation.None
 })
-export class DataManagementPlanWizardComponent implements AfterViewInit {
+export class DatasetWizardComponent implements AfterViewInit {
 
   constructor(
     private dataManagementPlanService: DataManagementPlanService,
diff --git a/dmp-frontend/src/app/datasets_new/dataset-listing.component.html b/dmp-frontend/src/app/datasets/dataset-listing.component.html
similarity index 100%
rename from dmp-frontend/src/app/datasets_new/dataset-listing.component.html
rename to dmp-frontend/src/app/datasets/dataset-listing.component.html
diff --git a/dmp-frontend/src/app/datasets_new/dataset-listing.component.scss b/dmp-frontend/src/app/datasets/dataset-listing.component.scss
similarity index 100%
rename from dmp-frontend/src/app/datasets_new/dataset-listing.component.scss
rename to dmp-frontend/src/app/datasets/dataset-listing.component.scss
diff --git a/dmp-frontend/src/app/datasets_new/dataset-listing.component.ts b/dmp-frontend/src/app/datasets/dataset-listing.component.ts
similarity index 100%
rename from dmp-frontend/src/app/datasets_new/dataset-listing.component.ts
rename to dmp-frontend/src/app/datasets/dataset-listing.component.ts
diff --git a/dmp-frontend/src/app/datasets_new/editor/dataset-editor.component.css b/dmp-frontend/src/app/datasets/editor/dataset-editor.component.css
similarity index 100%
rename from dmp-frontend/src/app/datasets_new/editor/dataset-editor.component.css
rename to dmp-frontend/src/app/datasets/editor/dataset-editor.component.css
diff --git a/dmp-frontend/src/app/datasets_new/editor/dataset-editor.component.html b/dmp-frontend/src/app/datasets/editor/dataset-editor.component.html
similarity index 100%
rename from dmp-frontend/src/app/datasets_new/editor/dataset-editor.component.html
rename to dmp-frontend/src/app/datasets/editor/dataset-editor.component.html
diff --git a/dmp-frontend/src/app/datasets_new/editor/dataset-editor.component.ts b/dmp-frontend/src/app/datasets/editor/dataset-editor.component.ts
similarity index 100%
rename from dmp-frontend/src/app/datasets_new/editor/dataset-editor.component.ts
rename to dmp-frontend/src/app/datasets/editor/dataset-editor.component.ts
diff --git a/dmp-frontend/src/app/homepage/homepage.component.ts b/dmp-frontend/src/app/homepage/homepage.component.ts
index 8beaf6983..c2c0da111 100644
--- a/dmp-frontend/src/app/homepage/homepage.component.ts
+++ b/dmp-frontend/src/app/homepage/homepage.component.ts
@@ -3,7 +3,6 @@ import { Router, ActivatedRoute } from '@angular/router';
 import { DashboardService } from '../../app/services/dashboard/dashboard.service';
 import { DashboardStatisticsModel } from '../models/dashboard/DashboardStatisticsModel';
 import { JsonSerializer } from '../utilities/JsonSerializer';
-import { DatasetListingComponent } from '../../app/datasets_new/dataset-listing.component';
 
 @Component({
   selector: 'homepage',