diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 5e8bb92..c2471a5 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -71,21 +71,21 @@
 import { AddChequeComponent } from './accounting/add-cheque/add-cheque.component';
 import { AddPayrollComponent } from './accounting/add-payroll/add-payroll.component';
 
-import {HttpClient} from '../../../sevices/http/http.service';
-import {IdentityService} from '../../../sevices/identity/identity.service';
-import {OfficeService} from '../../../sevices/office/office.service';
-import {CustomerService} from '../../../sevices/customer/customer.service';
-import {AuthenticationService} from '../../../sevices/security/authn/authentication.service';
-import {CatalogService} from '../../../sevices/catalog/catalog.service';
-import {AccountingService} from '../../../sevices/accounting/accounting.service';
-import {PortfolioService} from '../../../sevices/portfolio/portfolio.service';
+import {HttpClient} from './sevices/http/http.service';
+import {IdentityService} from './sevices/identity/identity.service';
+import {OfficeService} from './sevices/office/office.service';
+import {CustomerService} from './sevices/customer/customer.service';
+import {AuthenticationService} from './sevices/security/authn/authentication.service';
+import {CatalogService} from './sevices/catalog/catalog.service';
+import {AccountingService} from './sevices/accounting/accounting.service';
+import {PortfolioService} from './sevices/portfolio/portfolio.service';
 import {TranslateLoader, TranslateService} from '@ngx-translate/core';
 import {TranslateHttpLoader} from '@ngx-translate/http-loader';
-import {PermittableGroupIdMapper} from '../../../sevices/security/authz/permittable-group-id-mapper';
+import {PermittableGroupIdMapper} from './sevices/security/authz/permittable-group-id-mapper';
 import {reducer} from './store';
 import {StoreModule} from '@ngrx/store';
 import {EffectsModule} from '@ngrx/effects';
-import {NotificationService} from '../../../sevices/notification/notification.service';
+import {NotificationService} from './sevices/notification/notification.service';
 import {OfficeSearchApiEffects} from './store/office/effects/service.effects';
 import {EmployeeSearchApiEffects} from './store/employee/effects/service.effects';
 import {RoleSearchApiEffects} from './store/role/effects/service.effects';
@@ -96,15 +96,15 @@
 import {SecurityNotificationEffects} from './store/security/effects/notification.effects';
 import {LedgerSearchApiEffects} from './store/ledger/effects/service.effects';
 //import {ExistsGuardService} from './common/guards/exists-guard';
-import {CountryService} from '../../../sevices/country/country.service';
-import {ImageService} from '../../../sevices/image/image.service';
-import {DepositAccountService} from '../../../sevices/depositAccount/deposit-account.service';
-import {CurrencyService} from '../../../sevices/currency/currency.service';
-import {TellerService} from '../../../sevices/teller/teller-service';
-import {ReportingService} from '../../../sevices/reporting/reporting.service';
+import {ImageService} from './sevices/image/image.service';
+import {DepositAccountService} from './sevices/depositAccount/deposit-account.service';
+import {CurrencyService} from './sevices/currency/currency.service';
+import {TellerService} from './sevices/teller/teller-service';
+import {ReportingService} from './sevices/reporting/reporting.service';
 import {getSelectedLanguage} from './common/i18n/translate';
-import {ChequeService} from '../../../sevices/cheque/cheque.service';
-import {PayrollService} from '../../../sevices/payroll/payroll.service';
+import {ChequeService} from './sevices/cheque/cheque.service';
+import {PayrollService} from './sevices/payroll/payroll.service';
+import { CountryService } from './sevices/country/country.service';
 
 export function HttpLoaderFactory(http: Http) {
   return new TranslateHttpLoader(http, './assets/i18n/', '.json');
diff --git a/src/app/common/data-table/data-table.component.ts b/src/app/common/data-table/data-table.component.ts
index b20a08c..ded0277 100644
--- a/src/app/common/data-table/data-table.component.ts
+++ b/src/app/common/data-table/data-table.component.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 import {Component, EventEmitter, Input, Output} from '@angular/core';
-import {Sort} from '../../../sevices/domain/paging/sort.model';
-import {Page} from '../../../sevices/domain/paging/page.model';
+import {Sort} from '../../sevices/domain/paging/sort.model';
+import {Page} from '../../sevices/domain/paging/page.model';
 import {IPageChangeEvent, ITdDataTableColumn, ITdDataTableSortChangeEvent, TdDataTableSortingOrder} from '@covalent/core';
 import {TranslateService} from '@ngx-translate/core';
 
diff --git a/src/app/common/store/form.reducer.spec.ts b/src/app/common/store/form.reducer.spec.ts
index 3c4a869..b7fe33b 100644
--- a/src/app/common/store/form.reducer.spec.ts
+++ b/src/app/common/store/form.reducer.spec.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import {createFormReducer, FormState} from './form.reducer';
-import {Error} from '../../../sevices/domain/error.model';
+import {Error} from '../../sevices/domain/error.model';
 import {Action} from '@ngrx/store';
 
 class CreateSuccessAction implements Action {
diff --git a/src/app/common/store/form.reducer.ts b/src/app/common/store/form.reducer.ts
index e1852c4..d07ef07 100644
--- a/src/app/common/store/form.reducer.ts
+++ b/src/app/common/store/form.reducer.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import {Action, ActionReducer} from '@ngrx/store';
-import {Error} from '../../../sevices/domain/error.model';
+import {Error} from '../../sevices/domain/error.model';
 
 export interface FormState {
   error?: Error;
diff --git a/src/app/common/store/search.reducer.ts b/src/app/common/store/search.reducer.ts
index 49cc9d2..98daba7 100644
--- a/src/app/common/store/search.reducer.ts
+++ b/src/app/common/store/search.reducer.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import {Action, ActionReducer} from '@ngrx/store';
-import {FetchRequest} from '../../../sevices/domain/paging/fetch-request.model';
+import {FetchRequest} from '../../sevices/domain/paging/fetch-request.model';
 import {createSelector} from 'reselect';
 
 export function emptySearchResult(): SearchResult {
diff --git a/src/app/common/testing/permission-stubs.ts b/src/app/common/testing/permission-stubs.ts
index 269fb21..970581f 100644
--- a/src/app/common/testing/permission-stubs.ts
+++ b/src/app/common/testing/permission-stubs.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import {Directive, Input} from '@angular/core';
-import {FimsPermission} from '../../../sevices/security/authz/fims-permission.model';
+import {FimsPermission} from '../../sevices/security/authz/fims-permission.model';
 
 @Directive({
   // tslint:disable-next-line:directive-selector
diff --git a/src/app/common/util/account-assignments.ts b/src/app/common/util/account-assignments.ts
index f0d9aec..1805ab7 100644
--- a/src/app/common/util/account-assignments.ts
+++ b/src/app/common/util/account-assignments.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {AccountAssignment} from '../../../sevices/portfolio/domain/account-assignment.model';
+import {AccountAssignment} from '../../sevices/portfolio/domain/account-assignment.model';
 
 export function findAccountDesignator(accountAssignments: AccountAssignment[], designator: string): AccountAssignment {
   return accountAssignments.find(assignment => assignment.designator === designator);
diff --git a/src/app/office/store/office.actions.ts b/src/app/office/store/office.actions.ts
index f951040..d4c8ad7 100644
--- a/src/app/office/store/office.actions.ts
+++ b/src/app/office/store/office.actions.ts
@@ -18,8 +18,8 @@
  */
 import {Action} from '@ngrx/store';
 import {type} from '../../store/util';
-import {Office} from '../../../sevices/office/domain/office.model';
-import {Error} from '../../../sevices/domain/error.model';
+import {Office} from 'app/sevices/office/domain/office.model';
+import {Error} from 'app/sevices/domain/error.model';
 import {RoutePayload} from '../../common/store/route-payload';
 import {
   CreateResourceSuccessPayload,
diff --git a/src/app/office/store/teller/denomination/denomination.actions.ts b/src/app/office/store/teller/denomination/denomination.actions.ts
index 5d0f14a..c47110a 100644
--- a/src/app/office/store/teller/denomination/denomination.actions.ts
+++ b/src/app/office/store/teller/denomination/denomination.actions.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import {type} from '../../../../store/util';
-import {TellerDenomination} from '../../../sevices/teller/domain/teller-denomination.model';
+import {TellerDenomination} from 'app/sevices/teller/domain/teller-denomination.model';
 import {RoutePayload} from '../../../../common/store/route-payload';
 import {Action} from '@ngrx/store';
 
diff --git a/src/app/office/store/teller/denomination/denominations.reducer.ts b/src/app/office/store/teller/denomination/denominations.reducer.ts
index 8dc1db5..255a75d 100644
--- a/src/app/office/store/teller/denomination/denominations.reducer.ts
+++ b/src/app/office/store/teller/denomination/denominations.reducer.ts
@@ -18,7 +18,7 @@
  */
 import * as denominations from './denomination.actions';
 import {DenominationPayload} from './denomination.actions';
-import {TellerDenomination} from '../../../sevices/teller/domain/teller-denomination.model';
+import {TellerDenomination} from 'app/sevices/teller/domain/teller-denomination.model';
 
 export interface State {
   entities: TellerDenomination[];
diff --git a/src/app/office/store/teller/denomination/effects/notification.effects.ts b/src/app/office/store/teller/denomination/effects/notification.effects.ts
index 01be2f7..890ffb8 100644
--- a/src/app/office/store/teller/denomination/effects/notification.effects.ts
+++ b/src/app/office/store/teller/denomination/effects/notification.effects.ts
@@ -21,7 +21,7 @@
 import {Observable} from 'rxjs/Observable';
 import {Action} from '@ngrx/store';
 import * as denominationActions from '../denomination.actions';
-import {NotificationService, NotificationType} from '../../../sevices/notification/notification.service';
+import { NotificationService, NotificationType } from 'app/sevices/notification/notification.service';
 
 @Injectable()
 export class TellerDenominationNotificationEffects {
diff --git a/src/app/office/store/teller/denomination/effects/service.effects.ts b/src/app/office/store/teller/denomination/effects/service.effects.ts
index 96db8f8..c1ca732 100644
--- a/src/app/office/store/teller/denomination/effects/service.effects.ts
+++ b/src/app/office/store/teller/denomination/effects/service.effects.ts
@@ -22,7 +22,7 @@
 import {Action} from '@ngrx/store';
 import * as denominationActions from '../denomination.actions';
 import {of} from 'rxjs/observable/of';
-import {TellerService} from '../../../sevices/teller/teller-service';
+import {TellerService} from 'app/sevices/teller/teller-service';
 
 @Injectable()
 export class TellerDenominationApiEffects {