-import { NotificationsService } from 'angular2-notifications'
-import { FormReactive, UserService } from '../../../shared'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
-import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service'
+import { AuthService, Notifier, UserService } from '@app/core'
+import {
+ USER_CONFIRM_PASSWORD_VALIDATOR,
+ USER_EXISTING_PASSWORD_VALIDATOR,
+ USER_PASSWORD_VALIDATOR
+} from '@app/shared/form-validators/user-validators'
+import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
+import { User } from '@shared/models'