1 files changed, 28 insertions, 53 deletions

diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 7862c872..1bedfbfb 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -8,51 +8,40 @@ import { MatIconModule } from '@angular/material/icon';
 import { NgMultiSelectDropDownModule } from 'ng-multiselect-dropdown';
 import { NgChartsModule } from 'ng2-charts';
 import { Ng2SearchPipeModule } from 'ng2-search-filter';
-import { AppComponent } from './app.component';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { DatasetLoadComponent } from './_elements/dataset-load/dataset-load.component';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { LoginModalComponent } from './_modals/login-modal/login-modal.component';
 import { ReactiveFormsModule } from '@angular/forms';
-import { RegisterModalComponent } from './_modals/register-modal/register-modal.component';
-
+import { AppComponent } from './app.component';
+// Modules and modals
+import { Configuration } from './_services/configuration.service';
 import { MaterialModule } from './material.module';
+import { LoginModalComponent } from './_modals/login-modal/login-modal.component';
+import { RegisterModalComponent } from './_modals/register-modal/register-modal.component';
+import { AlertDialogComponent } from './_modals/alert-dialog/alert-dialog.component';
+import { YesNoDialogComponent } from './_modals/yes-no-dialog/yes-no-dialog.component';
+// Pages
 import { HomeComponent } from './_pages/home/home.component';
-import { NavbarComponent } from './_elements/navbar/navbar.component';
-import { ItemPredictorComponent } from './_elements/item-predictor/item-predictor.component';
-import { ItemDatasetComponent } from './_elements/item-dataset/item-dataset.component';
-import { CarouselComponent } from './_elements/carousel/carousel.component';
-import { SettingsComponent } from './_pages/settings/settings.component';
 import { ProfileComponent } from './_pages/profile/profile.component';
-import { MyPredictorsComponent } from './_pages/my-predictors/my-predictors.component';
-import { MyDatasetsComponent } from './_pages/my-datasets/my-datasets.component';
-import { MyModelsComponent } from './_pages/my-models/my-models.component';
-import { BrowseDatasetsComponent } from './_pages/browse-datasets/browse-datasets.component';
-import { BrowsePredictorsComponent } from './_pages/browse-predictors/browse-predictors.component';
-import { PredictComponent } from './_pages/predict/predict.component';
-import { ScatterchartComponent } from './scatterchart/scatterchart.component';
-import { BarchartComponent } from './barchart/barchart.component';
+import { ExperimentComponent } from './_pages/experiment/experiment.component';
+import { PlaygroundComponent } from './_pages/playground/playground.component';
+import { ArchiveComponent } from './_pages/archive/archive.component';
+// Charts
+import { ScatterchartComponent } from './_elements/_charts/scatterchart/scatterchart.component';
+import { BarchartComponent } from './_elements/_charts/barchart/barchart.component';
+import { PieChartComponent } from './_elements/_charts/pie-chart/pie-chart.component';
+import { BoxPlotComponent } from './_elements/_charts/box-plot/box-plot.component';
+// Elements
+import { NavbarComponent } from './_elements/navbar/navbar.component';
 import { NotificationsComponent } from './_elements/notifications/notifications.component';
 import { DatatableComponent } from './_elements/datatable/datatable.component';
-import { FilterDatasetsComponent } from './_pages/filter-datasets/filter-datasets.component';
 import { ReactiveBackgroundComponent } from './_elements/reactive-background/reactive-background.component';
-import { ItemModelComponent } from './_elements/item-model/item-model.component';
-import { AnnvisualComponent } from './_elements/annvisual/annvisual.component';
-import { ExperimentComponent } from './experiment/experiment.component';
 import { LoadingComponent } from './_elements/loading/loading.component';
-import { ModelLoadComponent } from './_elements/model-load/model-load.component';
-import { AlertDialogComponent } from './_modals/alert-dialog/alert-dialog.component';
-import { AddNewDatasetComponent } from './_elements/add-new-dataset/add-new-dataset.component';
 import { GraphComponent } from './_elements/graph/graph.component';
-import { TrainingComponent } from './training/training.component';
-import { ItemExperimentComponent } from './_elements/item-experiment/item-experiment.component';
-import { YesNoDialogComponent } from './_modals/yes-no-dialog/yes-no-dialog.component';
-import { Configuration } from './configuration.service';
-import { PlaygroundComponent } from './_pages/playground/playground.component';
 import { GradientBackgroundComponent } from './_elements/gradient-background/gradient-background.component';
-import { CarouselVerticalComponent } from './_elements/carousel-vertical/carousel-vertical.component';
-import { SelectItemListComponent } from './_elements/select-item-list/select-item-list.component';
 import { PlaylistComponent } from './_elements/playlist/playlist.component';
+import { FormDatasetComponent } from './_elements/form-dataset/form-dataset.component';
+import { FormModelComponent } from './_elements/form-model/form-model.component';
+import { ColumnTableComponent } from './_elements/column-table/column-table.component';
 
 export function initializeApp(appConfig: Configuration) {
   return () => appConfig.load();
@@ -60,44 +49,30 @@ export function initializeApp(appConfig: Configuration) {
 @NgModule({
   declarations: [
     AppComponent,
-    DatasetLoadComponent,
     LoginModalComponent,
     RegisterModalComponent,
     HomeComponent,
     NavbarComponent,
-    ItemPredictorComponent,
-    ItemDatasetComponent,
-    CarouselComponent,
-    SettingsComponent,
     ProfileComponent,
-    MyPredictorsComponent,
-    MyDatasetsComponent,
-    MyModelsComponent,
-    BrowseDatasetsComponent,
-    BrowsePredictorsComponent,
-    PredictComponent,
     ScatterchartComponent,
     BarchartComponent,
     NotificationsComponent,
     DatatableComponent,
-    FilterDatasetsComponent,
     ReactiveBackgroundComponent,
-    ItemModelComponent,
-    AnnvisualComponent,
     ExperimentComponent,
     LoadingComponent,
-    ModelLoadComponent,
     AlertDialogComponent,
-    AddNewDatasetComponent,
     GraphComponent,
-    TrainingComponent,
-    ItemExperimentComponent,
     YesNoDialogComponent,
     PlaygroundComponent,
     GradientBackgroundComponent,
-    CarouselVerticalComponent,
-    SelectItemListComponent,
-    PlaylistComponent
+    PlaylistComponent,
+    ArchiveComponent,
+    FormDatasetComponent,
+    FormModelComponent,
+    ColumnTableComponent,
+    PieChartComponent,
+    BoxPlotComponent
   ],
   imports: [
     BrowserModule,