diff --git a/smp-angular/src/app/app-info/smp-info.model.ts b/smp-angular/src/app/app-info/smp-info.model.ts
new file mode 100644
index 0000000000000000000000000000000000000000..e9c3f36e5dac721582530290ce28638906381298
--- /dev/null
+++ b/smp-angular/src/app/app-info/smp-info.model.ts
@@ -0,0 +1,3 @@
+export interface SmpInfo {
+  version: string;
+}
diff --git a/smp-angular/src/app/appinfo/domibus-info.service.ts b/smp-angular/src/app/app-info/smp-info.service.ts
similarity index 66%
rename from smp-angular/src/app/appinfo/domibus-info.service.ts
rename to smp-angular/src/app/app-info/smp-info.service.ts
index cd955d694bb4816876ce08659cfebf1442c1ecaa..9f509c4713c14640233dea96f74485fa2f5f6bf4 100644
--- a/smp-angular/src/app/appinfo/domibus-info.service.ts
+++ b/smp-angular/src/app/app-info/smp-info.service.ts
@@ -5,24 +5,24 @@ import "rxjs/add/operator/map";
 import {Router} from "@angular/router";
 import {HttpEventService} from "../http/http-event.service";
 import {ReplaySubject} from "rxjs";
-import {DomibusInfo} from "./domibus-info.model";
+import {SmpInfo} from "./smp-info.model";
 
 @Injectable()
-export class DomibusInfoService {
+export class SmpInfoService {
   constructor(private http: Http, private router: Router) {
   }
 
-  getDomibusInfo(): Observable<DomibusInfo> {
+  getSmpInfo(): Observable<SmpInfo> {
     let subject = new ReplaySubject();
     this.http.get('rest/application/info')
       .map((response: Response) => {
-        const domibusInfo:DomibusInfo = { version: response.json().version };
-        return domibusInfo;
+        const smpInfo: SmpInfo = { version: response.json().version };
+        return smpInfo;
       })
-      .subscribe((res: DomibusInfo) => {
+      .subscribe((res: SmpInfo) => {
         subject.next(res);
       }, (error: any) => {
-        console.log("getDomibusInfo:" + error);
+        console.log("getSmpInfo:" + error);
         // subject.next(null);
       });
     return subject.asObservable();
diff --git a/smp-angular/src/app/app.component.html b/smp-angular/src/app/app.component.html
index 83c3585fe6b3641579a7fae1078f1cd682abccd1..1aa6e50def638b5d6668d76d15fd0db1bf20cac6 100644
--- a/smp-angular/src/app/app.component.html
+++ b/smp-angular/src/app/app.component.html
@@ -41,7 +41,7 @@
       <div>
         <img src="assets/images/EC+Logo2.png"/>
       </div>
-      <div class="domibusTextSmall"
+      <div class="smpTextSmall"
            style="display: flex;flex-direction: column-reverse;text-align: left;color:#004494;padding-left: 5px;">
         <div>
           Connecting Europe
diff --git a/smp-angular/src/app/app.module.ts b/smp-angular/src/app/app.module.ts
index 36386ad02da9f611d565d77980e9e5fc93c74c1c..c020feac1a525e279c611200ccedc026267400d4 100644
--- a/smp-angular/src/app/app.module.ts
+++ b/smp-angular/src/app/app.module.ts
@@ -36,39 +36,39 @@ import {AlertComponent} from "./alert/alert.component";
 import {AlertService} from "./alert/alert.service";
 
 import {FooterComponent} from "./footer/footer.component";
-import {DomibusInfoService} from "./appinfo/domibus-info.service";
+import {SmpInfoService} from "./app-info/smp-info.service";
 import {AuthorizedAdminGuard} from "./guards/authorized-admin.guard";
-import {ServiceGroupComponent} from "./servicegroup/service-group.component";
+import {ServiceGroupComponent} from "./service-group/service-group.component";
 import {DomainComponent} from "./domain/domain.component";
 import {UserComponent} from "./user/user.component";
-import {TrustStoreComponent} from "./truststore/trust-store.component";
+import {TrustStoreComponent} from "./trust-store/trust-store.component";
 import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
-import {ServiceGroupMetadatalistDialogComponent} from "./servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component";
+import {ServiceGroupMetadataListDialogComponent} from "./service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component";
 import {RowLimiterComponent} from "./common/row-limiter/row-limiter.component";
-import {DatePipe} from "./customDate/date.pipe";
+import {DatePipe} from "./custom-date/date.pipe";
 import {CapitalizeFirstPipe} from "./common/capitalize-first.pipe";
 import {DefaultPasswordDialogComponent} from "./security/default-password-dialog/default-password-dialog.component";
-import {ServiceGroupDetailsDialogComponent} from "./servicegroup/servicegroup-details-dialog/service-group-details-dialog.component";
+import {ServiceGroupDetailsDialogComponent} from "./service-group/service-group-details-dialog/service-group-details-dialog.component";
 import {CancelDialogComponent} from "./common/cancel-dialog/cancel-dialog.component";
 import {DirtyGuard} from "./common/dirty.guard";
 import {SaveDialogComponent} from "./common/save-dialog/save-dialog.component";
-import {TrustStoreDialogComponent} from "./truststore/truststore-dialog/trust-store-dialog.component";
-import {TrustStoreUploadComponent} from "./truststore/truststore-upload/trust-store-upload.component";
+import {TrustStoreDialogComponent} from "./trust-store/trust-store-dialog/trust-store-dialog.component";
+import {TrustStoreUploadComponent} from "./trust-store/trust-store-upload/trust-store-upload.component";
 import {ColumnPickerComponent} from "./common/column-picker/column-picker.component";
 import {PageHelperComponent} from "./common/page-helper/page-helper.component";
 import {SharedModule} from "./common/module/shared.module";
-import {ClearInvalidDirective} from "./customDate/clear-invalid.directive";
+import {ClearInvalidDirective} from "./custom-date/clear-invalid.directive";
 import {PageHeaderComponent} from "./common/page-header/page-header.component";
 import {DomainSelectorComponent} from "./common/domain-selector/domain-selector.component";
 import {AlertsComponent} from "./alerts/alerts.component";
 
-import {SearchTableComponent} from "./common/searchtable/search-table.component";
-import {ServiceGroupExtensionDialogComponent} from "./servicegroup/servicegroup-extension-dialog/service-group-extension-dialog.component";
-import {ServiceGroupMetadataDialogComponent} from "./servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component";
+import {SearchTableComponent} from "./common/search-table/search-table.component";
+import {ServiceGroupExtensionDialogComponent} from "./service-group/service-group-extension-dialog/service-group-extension-dialog.component";
+import {ServiceGroupMetadataDialogComponent} from "./service-group/service-group-metadata-dialog/service-group-metadata-dialog.component";
 import {DomainDetailsDialogComponent} from "./domain/domain-details-dialog/domain-details-dialog.component";
 import {UserDetailsDialogComponent} from "./user/user-details-dialog/user-details-dialog.component";
 import {DownloadService} from "./download/download.service";
-import {TrustStoreService} from "./truststore/trust-store.service";
+import {TrustStoreService} from "./trust-store/trust-store.service";
 
 export function extendedHttpClientFactory(xhrBackend: XHRBackend, requestOptions: RequestOptions, httpEventService: HttpEventService) {
   return new ExtendedHttpClient(xhrBackend, requestOptions, httpEventService);
@@ -88,7 +88,7 @@ export function extendedHttpClientFactory(xhrBackend: XHRBackend, requestOptions
     IsAuthorized,
     TrustStoreComponent,
     SaveDialogComponent,
-    ServiceGroupMetadatalistDialogComponent,
+    ServiceGroupMetadataListDialogComponent,
     ServiceGroupMetadataDialogComponent,
     ServiceGroupExtensionDialogComponent,
     CancelDialogComponent,
@@ -111,7 +111,7 @@ export function extendedHttpClientFactory(xhrBackend: XHRBackend, requestOptions
   ],
   entryComponents: [
     AppComponent,
-    ServiceGroupMetadatalistDialogComponent,
+    ServiceGroupMetadataListDialogComponent,
     ServiceGroupMetadataDialogComponent,
     ServiceGroupDetailsDialogComponent,
     ServiceGroupExtensionDialogComponent,
@@ -154,7 +154,7 @@ export function extendedHttpClientFactory(xhrBackend: XHRBackend, requestOptions
     SecurityService,
     SecurityEventService,
     DomainService,
-    DomibusInfoService,
+    SmpInfoService,
     AlertService,
     DownloadService,
     TrustStoreService,
diff --git a/smp-angular/src/app/app.routes.ts b/smp-angular/src/app/app.routes.ts
index c1a87bf321ca42abe47337c6d1899f0b6601cc06..1fd5f20f504f6166cbf0f53ab5119cd7eadba425 100644
--- a/smp-angular/src/app/app.routes.ts
+++ b/smp-angular/src/app/app.routes.ts
@@ -1,11 +1,11 @@
 import {RouterModule, Routes} from '@angular/router';
 import {LoginComponent} from './login/login.component';
-import {ServiceGroupComponent} from './servicegroup/service-group.component';
+import {ServiceGroupComponent} from './service-group/service-group.component';
 import {DomainComponent} from './domain/domain.component';
 import {AuthenticatedGuard} from './guards/authenticated.guard';
 import {AuthorizedAdminGuard} from './guards/authorized-admin.guard';
 import {UserComponent} from './user/user.component';
-import {TrustStoreComponent} from 'app/truststore/trust-store.component';
+import {TrustStoreComponent} from 'app/trust-store/trust-store.component';
 
 
 const appRoutes: Routes = [
diff --git a/smp-angular/src/app/appinfo/domibus-info.model.ts b/smp-angular/src/app/appinfo/domibus-info.model.ts
deleted file mode 100644
index a871d1ac6e311ae0f9aad76e4ae00ba1cf210425..0000000000000000000000000000000000000000
--- a/smp-angular/src/app/appinfo/domibus-info.model.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface DomibusInfo {
-  version: string;
-}
diff --git a/smp-angular/src/app/common/searchtable/search-table-controller.ts b/smp-angular/src/app/common/search-table/search-table-controller.ts
similarity index 100%
rename from smp-angular/src/app/common/searchtable/search-table-controller.ts
rename to smp-angular/src/app/common/search-table/search-table-controller.ts
diff --git a/smp-angular/src/app/common/searchtable/search-table-result.model.ts b/smp-angular/src/app/common/search-table/search-table-result.model.ts
similarity index 100%
rename from smp-angular/src/app/common/searchtable/search-table-result.model.ts
rename to smp-angular/src/app/common/search-table/search-table-result.model.ts
diff --git a/smp-angular/src/app/common/searchtable/search-table.component.css b/smp-angular/src/app/common/search-table/search-table.component.css
similarity index 100%
rename from smp-angular/src/app/common/searchtable/search-table.component.css
rename to smp-angular/src/app/common/search-table/search-table.component.css
diff --git a/smp-angular/src/app/common/searchtable/search-table.component.html b/smp-angular/src/app/common/search-table/search-table.component.html
similarity index 100%
rename from smp-angular/src/app/common/searchtable/search-table.component.html
rename to smp-angular/src/app/common/search-table/search-table.component.html
diff --git a/smp-angular/src/app/common/searchtable/search-table.component.ts b/smp-angular/src/app/common/search-table/search-table.component.ts
similarity index 100%
rename from smp-angular/src/app/common/searchtable/search-table.component.ts
rename to smp-angular/src/app/common/search-table/search-table.component.ts
diff --git a/smp-angular/src/app/customDate/clear-invalid.directive.ts b/smp-angular/src/app/custom-date/clear-invalid.directive.ts
similarity index 100%
rename from smp-angular/src/app/customDate/clear-invalid.directive.ts
rename to smp-angular/src/app/custom-date/clear-invalid.directive.ts
diff --git a/smp-angular/src/app/customDate/date-format.service.ts b/smp-angular/src/app/custom-date/date-format.service.ts
similarity index 100%
rename from smp-angular/src/app/customDate/date-format.service.ts
rename to smp-angular/src/app/custom-date/date-format.service.ts
diff --git a/smp-angular/src/app/customDate/date.pipe.ts b/smp-angular/src/app/custom-date/date.pipe.ts
similarity index 100%
rename from smp-angular/src/app/customDate/date.pipe.ts
rename to smp-angular/src/app/custom-date/date.pipe.ts
diff --git a/smp-angular/src/app/domain/domain-controller.ts b/smp-angular/src/app/domain/domain-controller.ts
index 75659116bd2f47b5c6aa485c29b6e3f48307c774..b5b62d4a96ff99225b1cb9758fed4eb1522de3aa 100644
--- a/smp-angular/src/app/domain/domain-controller.ts
+++ b/smp-angular/src/app/domain/domain-controller.ts
@@ -1,4 +1,4 @@
-import {SearchTableController} from "../common/searchtable/search-table-controller";
+import {SearchTableController} from "../common/search-table/search-table-controller";
 import {MdDialog, MdDialogRef} from "@angular/material";
 import {DomainDetailsDialogComponent} from "./domain-details-dialog/domain-details-dialog.component";
 
diff --git a/smp-angular/src/app/footer/footer.component.css b/smp-angular/src/app/footer/footer.component.css
index d06fb69f22f2c540e282ee21409266bd5340cb94..c7440cb2a24d36391bab9a62ec5ee3577aa7a8be 100644
--- a/smp-angular/src/app/footer/footer.component.css
+++ b/smp-angular/src/app/footer/footer.component.css
@@ -7,7 +7,7 @@
   text-align: center;
 }
 
-#footer .domibusVersion {
+#footer .smpVersion {
   display: inline-block;
   font-size: 15px;
 }
diff --git a/smp-angular/src/app/footer/footer.component.html b/smp-angular/src/app/footer/footer.component.html
index 816b3d5980cad2028151080423cb1f9217705f80..d12698f7bc9f393269b1897e434e727f0130deb6 100644
--- a/smp-angular/src/app/footer/footer.component.html
+++ b/smp-angular/src/app/footer/footer.component.html
@@ -1,3 +1,3 @@
 <div id="footer">
-  <span class="domibusVersion">{{domibusVersion}}</span>
+  <span class="smpVersion">{{smpVersion}}</span>
 </div>
diff --git a/smp-angular/src/app/footer/footer.component.ts b/smp-angular/src/app/footer/footer.component.ts
index c4a38a73308ceaf3462a66e5a96cc7d721f4959e..044b7ce38f59b96fcedc5501cb32ca97dea3410d 100644
--- a/smp-angular/src/app/footer/footer.component.ts
+++ b/smp-angular/src/app/footer/footer.component.ts
@@ -1,6 +1,6 @@
 import {Component, OnInit} from "@angular/core";
-import {DomibusInfoService} from "../appinfo/domibus-info.service";
-import {DomibusInfo} from "../appinfo/domibus-info.model";
+import {SmpInfoService} from "../app-info/smp-info.service";
+import {SmpInfo} from "../app-info/smp-info.model";
 
 @Component({
   moduleId: module.id,
@@ -10,15 +10,15 @@ import {DomibusInfo} from "../appinfo/domibus-info.model";
 })
 
 export class FooterComponent implements OnInit {
-  domibusVersion: string;
+  smpVersion: string;
 
-  constructor(private domibusInfoService: DomibusInfoService) {
+  constructor(private smpInfoService: SmpInfoService) {
   }
 
   ngOnInit(): void {
     console.log("FooterComponent onInit");
-    this.domibusInfoService.getDomibusInfo().subscribe((domibusInfo: DomibusInfo) => {
-      this.domibusVersion = domibusInfo.version;
+    this.smpInfoService.getSmpInfo().subscribe((smpInfo: SmpInfo) => {
+      this.smpVersion = smpInfo.version;
       }
     );
   }
diff --git a/smp-angular/src/app/login/login.component.ts b/smp-angular/src/app/login/login.component.ts
index ed184568a8a530df59015335d9d29573b2521734..3bf655d893fbba6781dbf46df995f7b0244293a8 100644
--- a/smp-angular/src/app/login/login.component.ts
+++ b/smp-angular/src/app/login/login.component.ts
@@ -73,7 +73,7 @@ export class LoginComponent implements OnInit, OnDestroy {
             break;
           case HTTP_GATEWAY_TIMEOUT:
           case HTTP_NOTFOUND:
-            message = "Unable to login. Domibus is not running.";
+            message = "Unable to login. SMP is not running.";
             break;
           default:
             message = "Default error (" + error.status + ") occurred during login.";
diff --git a/smp-angular/src/app/servicegroup/service-group-controller.ts b/smp-angular/src/app/service-group/service-group-controller.ts
similarity index 64%
rename from smp-angular/src/app/servicegroup/service-group-controller.ts
rename to smp-angular/src/app/service-group/service-group-controller.ts
index aa970c27bb4b4d0857a1823e72d8b794e74afc49..8dc51671053b65f4dbd5c1d624d423584913e8ae 100644
--- a/smp-angular/src/app/servicegroup/service-group-controller.ts
+++ b/smp-angular/src/app/service-group/service-group-controller.ts
@@ -1,10 +1,10 @@
-import {SearchTableController} from "../common/searchtable/search-table-controller";
+import {SearchTableController} from "../common/search-table/search-table-controller";
 import {MdDialog, MdDialogRef} from "@angular/material";
-import {ServiceGroupDetailsDialogComponent} from "./servicegroup-details-dialog/service-group-details-dialog.component";
+import {ServiceGroupDetailsDialogComponent} from "./service-group-details-dialog/service-group-details-dialog.component";
 import {Http} from "@angular/http";
 import {AlertService} from "../alert/alert.service";
-import {ServiceGroupExtensionDialogComponent} from "./servicegroup-extension-dialog/service-group-extension-dialog.component";
-import {ServiceGroupMetadatalistDialogComponent} from "./servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component";
+import {ServiceGroupExtensionDialogComponent} from "./service-group-extension-dialog/service-group-extension-dialog.component";
+import {ServiceGroupMetadataListDialogComponent} from "./service-group-metadata-list-dialog/service-group-metadata-list-dialog.component";
 
 export class ServiceGroupController implements SearchTableController {
 
@@ -27,7 +27,7 @@ export class ServiceGroupController implements SearchTableController {
   }
 
   public showMetadataList(row: any) {
-    let dialogRef: MdDialogRef<ServiceGroupMetadatalistDialogComponent> = this.dialog.open(ServiceGroupMetadatalistDialogComponent);
+    let dialogRef: MdDialogRef<ServiceGroupMetadataListDialogComponent> = this.dialog.open(ServiceGroupMetadataListDialogComponent);
    // dialogRef.componentInstance.servicegroup = row;
     dialogRef.afterClosed().subscribe(result => {
       //Todo:
diff --git a/smp-angular/src/app/servicegroup/servicegroup-details-dialog/service-group-details-dialog.component.html b/smp-angular/src/app/service-group/service-group-details-dialog/service-group-details-dialog.component.html
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-details-dialog/service-group-details-dialog.component.html
rename to smp-angular/src/app/service-group/service-group-details-dialog/service-group-details-dialog.component.html
diff --git a/smp-angular/src/app/servicegroup/servicegroup-details-dialog/service-group-details-dialog.component.spec.ts b/smp-angular/src/app/service-group/service-group-details-dialog/service-group-details-dialog.component.spec.ts
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-details-dialog/service-group-details-dialog.component.spec.ts
rename to smp-angular/src/app/service-group/service-group-details-dialog/service-group-details-dialog.component.spec.ts
diff --git a/smp-angular/src/app/servicegroup/servicegroup-details-dialog/service-group-details-dialog.component.ts b/smp-angular/src/app/service-group/service-group-details-dialog/service-group-details-dialog.component.ts
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-details-dialog/service-group-details-dialog.component.ts
rename to smp-angular/src/app/service-group/service-group-details-dialog/service-group-details-dialog.component.ts
diff --git a/smp-angular/src/app/servicegroup/servicegroup-extension-dialog/service-group-extension-dialog.component.html b/smp-angular/src/app/service-group/service-group-extension-dialog/service-group-extension-dialog.component.html
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-extension-dialog/service-group-extension-dialog.component.html
rename to smp-angular/src/app/service-group/service-group-extension-dialog/service-group-extension-dialog.component.html
diff --git a/smp-angular/src/app/servicegroup/servicegroup-extension-dialog/service-group-extension-dialog.component.spec.ts b/smp-angular/src/app/service-group/service-group-extension-dialog/service-group-extension-dialog.component.spec.ts
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-extension-dialog/service-group-extension-dialog.component.spec.ts
rename to smp-angular/src/app/service-group/service-group-extension-dialog/service-group-extension-dialog.component.spec.ts
diff --git a/smp-angular/src/app/servicegroup/servicegroup-extension-dialog/service-group-extension-dialog.component.ts b/smp-angular/src/app/service-group/service-group-extension-dialog/service-group-extension-dialog.component.ts
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-extension-dialog/service-group-extension-dialog.component.ts
rename to smp-angular/src/app/service-group/service-group-extension-dialog/service-group-extension-dialog.component.ts
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.css b/smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.css
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.css
rename to smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.css
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.html b/smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.html
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.html
rename to smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.html
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.spec.ts b/smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.spec.ts
similarity index 92%
rename from smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.spec.ts
rename to smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.spec.ts
index 76277ee708dad29fd2f2f6d88312d31982c4ce37..86acc1f1913a61b83d755d8f4bfdab3ddcbba05e 100644
--- a/smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.spec.ts
+++ b/smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.spec.ts
@@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ServiceGroupMetadataDialogComponent } from './service-group-metadata-dialog.component';
 
-describe('ServicegroupExtensionDialogComponent', () => {
+describe('ServiceGroupMetadataDialogComponent', () => {
   let component: ServiceGroupMetadataDialogComponent;
   let fixture: ComponentFixture<ServiceGroupMetadataDialogComponent>;
 
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.ts b/smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.ts
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.ts
rename to smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.ts
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.css b/smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.css
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.css
rename to smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.css
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.html b/smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.html
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.html
rename to smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.html
diff --git a/smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.spec.ts b/smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..d01831eaf44f03a3efa49e631290cfd493e2821b
--- /dev/null
+++ b/smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ServiceGroupMetadataListDialogComponent } from './service-group-metadata-list-dialog.component';
+
+describe('ServiceGroupMetadataListDialogComponent', () => {
+  let component: ServiceGroupMetadataListDialogComponent;
+  let fixture: ComponentFixture<ServiceGroupMetadataListDialogComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ServiceGroupMetadataListDialogComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ServiceGroupMetadataListDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.ts b/smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.ts
similarity index 82%
rename from smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.ts
rename to smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.ts
index 68ce5d48f7c1cad52b07799e95e0245264186d30..617ca79f98af616e8b811a9c6bd0906777d8aefb 100644
--- a/smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.ts
+++ b/smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.ts
@@ -3,15 +3,15 @@ import {MdDialog, MdDialogRef} from "@angular/material";
 import {ColumnPicker} from "../../common/column-picker/column-picker.model";
 import {ServiceGroupController} from "../service-group-controller";
 import {RowLimiter} from "../../common/row-limiter/row-limiter.model";
-import {ServiceGroupExtensionDialogComponent} from "../servicegroup-extension-dialog/service-group-extension-dialog.component";
-import {ServiceGroupMetadataDialogComponent} from "../servicegroup-metadata-dialog/service-group-metadata-dialog.component";
+import {ServiceGroupExtensionDialogComponent} from "../service-group-extension-dialog/service-group-extension-dialog.component";
+import {ServiceGroupMetadataDialogComponent} from "../service-group-metadata-dialog/service-group-metadata-dialog.component";
 
 @Component({
   selector: 'app-messagelog-dialog',
-  templateUrl: './service-group-metadatalist-dialog.component.html',
-  styleUrls: ['./service-group-metadatalist-dialog.component.css']
+  templateUrl: './service-group-metadata-list-dialog.component.html',
+  styleUrls: ['./service-group-metadata-list-dialog.component.css']
 })
-export class ServiceGroupMetadatalistDialogComponent implements OnInit {
+export class ServiceGroupMetadataListDialogComponent implements OnInit {
 
   @ViewChild('rowActions') rowActions: TemplateRef<any>;
 
@@ -32,7 +32,7 @@ export class ServiceGroupMetadatalistDialogComponent implements OnInit {
 
   messageResent = new EventEmitter(false);
 
-  constructor(public dialogRef: MdDialogRef<ServiceGroupMetadatalistDialogComponent>, public dialog: MdDialog) {
+  constructor(public dialogRef: MdDialogRef<ServiceGroupMetadataListDialogComponent>, public dialog: MdDialog) {
   }
 
   ngOnInit() {
diff --git a/smp-angular/src/app/servicegroup/service-group-ro-id.model.ts b/smp-angular/src/app/service-group/service-group-ro-id.model.ts
similarity index 100%
rename from smp-angular/src/app/servicegroup/service-group-ro-id.model.ts
rename to smp-angular/src/app/service-group/service-group-ro-id.model.ts
diff --git a/smp-angular/src/app/servicegroup/service-group-ro.model.ts b/smp-angular/src/app/service-group/service-group-ro.model.ts
similarity index 100%
rename from smp-angular/src/app/servicegroup/service-group-ro.model.ts
rename to smp-angular/src/app/service-group/service-group-ro.model.ts
diff --git a/smp-angular/src/app/servicegroup/service-group.component.css b/smp-angular/src/app/service-group/service-group.component.css
similarity index 100%
rename from smp-angular/src/app/servicegroup/service-group.component.css
rename to smp-angular/src/app/service-group/service-group.component.css
diff --git a/smp-angular/src/app/servicegroup/service-group.component.html b/smp-angular/src/app/service-group/service-group.component.html
similarity index 100%
rename from smp-angular/src/app/servicegroup/service-group.component.html
rename to smp-angular/src/app/service-group/service-group.component.html
diff --git a/smp-angular/src/app/servicegroup/service-group.component.ts b/smp-angular/src/app/service-group/service-group.component.ts
similarity index 94%
rename from smp-angular/src/app/servicegroup/service-group.component.ts
rename to smp-angular/src/app/service-group/service-group.component.ts
index 08ffa3f3a8319a2bf9f7272f5ad0d9187b4b191c..6e13170d39afae82b35d0ba59986d5dadb54ad30 100644
--- a/smp-angular/src/app/servicegroup/service-group.component.ts
+++ b/smp-angular/src/app/service-group/service-group.component.ts
@@ -1,7 +1,7 @@
 import {Component, TemplateRef, ViewChild} from "@angular/core";
 import {ColumnPicker} from "../common/column-picker/column-picker.model";
 import {MdDialog, MdDialogRef} from "@angular/material";
-import {ServiceGroupDetailsDialogComponent} from "./servicegroup-details-dialog/service-group-details-dialog.component";
+import {ServiceGroupDetailsDialogComponent} from "./service-group-details-dialog/service-group-details-dialog.component";
 import {Http} from "@angular/http";
 import {AlertService} from "../alert/alert.service";
 import {ServiceGroupController} from "./service-group-controller";
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.spec.ts b/smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.spec.ts
deleted file mode 100644
index 65e130db79717785e933cc3b95735133f38c281b..0000000000000000000000000000000000000000
--- a/smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ServiceGroupMetadatalistDialogComponent } from './service-group-metadatalist-dialog.component';
-
-describe('ServicegroupExtensionDialogComponent', () => {
-  let component: ServiceGroupMetadatalistDialogComponent;
-  let fixture: ComponentFixture<ServiceGroupMetadatalistDialogComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ServiceGroupMetadatalistDialogComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ServiceGroupMetadatalistDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/smp-angular/src/app/truststore/truststore-dialog/trust-store-dialog.component.html b/smp-angular/src/app/trust-store/trust-store-dialog/trust-store-dialog.component.html
similarity index 100%
rename from smp-angular/src/app/truststore/truststore-dialog/trust-store-dialog.component.html
rename to smp-angular/src/app/trust-store/trust-store-dialog/trust-store-dialog.component.html
diff --git a/smp-angular/src/app/truststore/truststore-dialog/trust-store-dialog.component.spec.ts b/smp-angular/src/app/trust-store/trust-store-dialog/trust-store-dialog.component.spec.ts
similarity index 100%
rename from smp-angular/src/app/truststore/truststore-dialog/trust-store-dialog.component.spec.ts
rename to smp-angular/src/app/trust-store/trust-store-dialog/trust-store-dialog.component.spec.ts
diff --git a/smp-angular/src/app/truststore/truststore-dialog/trust-store-dialog.component.ts b/smp-angular/src/app/trust-store/trust-store-dialog/trust-store-dialog.component.ts
similarity index 100%
rename from smp-angular/src/app/truststore/truststore-dialog/trust-store-dialog.component.ts
rename to smp-angular/src/app/trust-store/trust-store-dialog/trust-store-dialog.component.ts
diff --git a/smp-angular/src/app/truststore/trust-store-entry.model.ts b/smp-angular/src/app/trust-store/trust-store-entry.model.ts
similarity index 100%
rename from smp-angular/src/app/truststore/trust-store-entry.model.ts
rename to smp-angular/src/app/trust-store/trust-store-entry.model.ts
diff --git a/smp-angular/src/app/truststore/truststore-upload/trust-store-upload.component.html b/smp-angular/src/app/trust-store/trust-store-upload/trust-store-upload.component.html
similarity index 100%
rename from smp-angular/src/app/truststore/truststore-upload/trust-store-upload.component.html
rename to smp-angular/src/app/trust-store/trust-store-upload/trust-store-upload.component.html
diff --git a/smp-angular/src/app/truststore/truststore-upload/trust-store-upload.component.spec.ts b/smp-angular/src/app/trust-store/trust-store-upload/trust-store-upload.component.spec.ts
similarity index 100%
rename from smp-angular/src/app/truststore/truststore-upload/trust-store-upload.component.spec.ts
rename to smp-angular/src/app/trust-store/trust-store-upload/trust-store-upload.component.spec.ts
diff --git a/smp-angular/src/app/truststore/truststore-upload/trust-store-upload.component.ts b/smp-angular/src/app/trust-store/trust-store-upload/trust-store-upload.component.ts
similarity index 100%
rename from smp-angular/src/app/truststore/truststore-upload/trust-store-upload.component.ts
rename to smp-angular/src/app/trust-store/trust-store-upload/trust-store-upload.component.ts
diff --git a/smp-angular/src/app/truststore/trust-store.component.css b/smp-angular/src/app/trust-store/trust-store.component.css
similarity index 100%
rename from smp-angular/src/app/truststore/trust-store.component.css
rename to smp-angular/src/app/trust-store/trust-store.component.css
diff --git a/smp-angular/src/app/truststore/trust-store.component.html b/smp-angular/src/app/trust-store/trust-store.component.html
similarity index 100%
rename from smp-angular/src/app/truststore/trust-store.component.html
rename to smp-angular/src/app/trust-store/trust-store.component.html
diff --git a/smp-angular/src/app/truststore/trust-store.component.spec.ts b/smp-angular/src/app/trust-store/trust-store.component.spec.ts
similarity index 100%
rename from smp-angular/src/app/truststore/trust-store.component.spec.ts
rename to smp-angular/src/app/trust-store/trust-store.component.spec.ts
diff --git a/smp-angular/src/app/truststore/trust-store.component.ts b/smp-angular/src/app/trust-store/trust-store.component.ts
similarity index 95%
rename from smp-angular/src/app/truststore/trust-store.component.ts
rename to smp-angular/src/app/trust-store/trust-store.component.ts
index d02abc60fb50c0d8216c0cf6eba994f81455bda6..553a16c99fd53c057be4ad438213951937eed094 100644
--- a/smp-angular/src/app/truststore/trust-store.component.ts
+++ b/smp-angular/src/app/trust-store/trust-store.component.ts
@@ -3,9 +3,9 @@ import "rxjs/add/operator/map";
 import "rxjs/add/operator/catch";
 import {TrustStoreService} from "./trust-store.service";
 import {TrustStoreEntry} from "./trust-store-entry.model";
-import {TrustStoreDialogComponent} from "./truststore-dialog/trust-store-dialog.component";
+import {TrustStoreDialogComponent} from "./trust-store-dialog/trust-store-dialog.component";
 import {MdDialog, MdDialogRef} from "@angular/material";
-import {TrustStoreUploadComponent} from "./truststore-upload/trust-store-upload.component";
+import {TrustStoreUploadComponent} from "./trust-store-upload/trust-store-upload.component";
 import {ColumnPicker} from "../common/column-picker/column-picker.model";
 import {RowLimiter} from "../common/row-limiter/row-limiter.model";
 import {DownloadService} from "../download/download.service";
diff --git a/smp-angular/src/app/truststore/trust-store.service.ts b/smp-angular/src/app/trust-store/trust-store.service.ts
similarity index 100%
rename from smp-angular/src/app/truststore/trust-store.service.ts
rename to smp-angular/src/app/trust-store/trust-store.service.ts
diff --git a/smp-angular/src/app/user/user-controller.ts b/smp-angular/src/app/user/user-controller.ts
index e7af9ab3d6a1c65113b1f5b252d545b6e1dc586b..9ada4224bfea3801cfb7ad9bc91b58cd5f2fc979 100644
--- a/smp-angular/src/app/user/user-controller.ts
+++ b/smp-angular/src/app/user/user-controller.ts
@@ -1,4 +1,4 @@
-import {SearchTableController} from "../common/searchtable/search-table-controller";
+import {SearchTableController} from "../common/search-table/search-table-controller";
 import {MdDialog, MdDialogRef} from "@angular/material";
 import {UserDetailsDialogComponent} from "./user-details-dialog/user-details-dialog.component";
 
diff --git a/smp-angular/src/assets/images/smp_logo_icon.svg b/smp-angular/src/assets/images/smp_logo_icon.svg
index f2005c7c205602891a3f938ba1c427d6a81b0ac3..0d6eff915a081149bc3a9bcf65b1051943af5867 100755
--- a/smp-angular/src/assets/images/smp_logo_icon.svg
+++ b/smp-angular/src/assets/images/smp_logo_icon.svg
@@ -24,7 +24,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Domibus_logo_icon_2</dc:title>
+        <dc:title>SMP_logo_icon_2</dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -51,7 +51,7 @@
      inkscape:current-layer="g3392" />
   <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
   <title
-     id="title4">Domibus_logo_icon_2</title>
+     id="title4">SMP_logo_icon_2</title>
   <desc
      id="desc6">Created with Sketch.</desc>
   <defs
@@ -247,7 +247,7 @@
      style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
      transform="translate(0,-528)">
     <g
-       id="Domibus_logo_icon_2">
+       id="SMP_logo_icon_2">
       <g
          id="Group-2"
          transform="translate(94,111)">