Merge pull request #2617 from NoelDeMartin/MOBILE-3320

MOBILE-3320: Use consistent suffixes and move styles

angular.json

@@ -33,10 +33,7 @@
             ],
             "styles": [
               {
-                "input": "src/theme/variables.scss"
-              },
-              {
-                "input": "src/global.scss"
+                "input": "src/theme/global.scss"
               }
             ],
             "scripts": [],

src/addons/privatefiles/pages/index/index.module.ts

@@ -22,7 +22,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { CoreComponentsModule } from '@components/components.module';
 import { CoreDirectivesModule } from '@directives/directives.module';
 
-import { AddonPrivateFilesIndexPage } from './index.page';
+import { AddonPrivateFilesIndexPage } from '.';
 
 const routes: Routes = [
     {

src/addons/privatefiles/pages/index/index.ts

@@ -21,7 +21,7 @@ import { CoreApp } from '@services/app';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
-import { Translate } from '@singletons/core.singletons';
+import { Translate } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import {
     AddonPrivateFiles,
@@ -30,7 +30,7 @@ import {
     AddonPrivateFilesGetUserInfoWSResult,
     AddonPrivateFilesGetFilesWSParams,
 } from '@/addons/privatefiles/services/privatefiles';
-import { AddonPrivateFilesHelper } from '@/addons/privatefiles/services/privatefiles.helper';
+import { AddonPrivateFilesHelper } from '@/addons/privatefiles/services/privatefiles-helper';
 import { CoreUtils } from '@services/utils/utils';
 
 /**

src/addons/privatefiles/privatefiles-init.module.ts

@@ -15,7 +15,7 @@
 import { NgModule } from '@angular/core';
 import { Routes } from '@angular/router';
 
-import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu.delegate';
+import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu-delegate';
 import { CoreMainMenuRoutingModule } from '@features/mainmenu/mainmenu-routing.module';
 import { AddonPrivateFilesMainMenuHandler } from './services/handlers/mainmenu';
 

src/addons/privatefiles/privatefiles-routing.module.ts

@@ -23,7 +23,7 @@ const routes: Routes = [
     },
     {
         path: ':hash',
-        loadChildren: () => import('./pages/index/index.page.module').then( m => m.AddonPrivateFilesIndexPageModule),
+        loadChildren: () => import('./pages/index/index.module').then( m => m.AddonPrivateFilesIndexPageModule),
     },
 ];
 

src/addons/privatefiles/services/handlers/mainmenu.ts

@@ -14,7 +14,7 @@
 
 import { Injectable } from '@angular/core';
 
-import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '@features/mainmenu/services/mainmenu.delegate';
+import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '@features/mainmenu/services/mainmenu-delegate';
 import { AddonPrivateFiles } from '@/addons/privatefiles/services/privatefiles';
 
 /**

src/addons/privatefiles/services/privatefiles-helper.ts

@@ -16,10 +16,10 @@ import { Injectable } from '@angular/core';
 
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreFileUploaderHelper } from '@features/fileuploader/services/fileuploader.helper';
+import { CoreFileUploaderHelper } from '@features/fileuploader/services/fileuploader-helper';
 import { AddonPrivateFiles, AddonPrivateFilesGetUserInfoWSResult } from './privatefiles';
 import { CoreError } from '@classes/errors/error';
-import { makeSingleton, Translate } from '@singletons/core.singletons';
+import { makeSingleton, Translate } from '@singletons';
 
 /**
  * Service that provides some helper functions regarding private and site files.

src/addons/privatefiles/services/privatefiles.ts

@@ -18,7 +18,7 @@ import { CoreSites } from '@services/sites';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
 import { CoreWSExternalWarning } from '@services/ws';
 import { CoreSite } from '@classes/site';
-import { makeSingleton } from '@singletons/core.singletons';
+import { makeSingleton } from '@singletons';
 
 const ROOT_CACHE_KEY = 'mmaFiles:';
 

src/app/app-routing.module.ts

@@ -15,7 +15,7 @@
 import { NgModule } from '@angular/core';
 import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
 
-import { AuthGuard } from '@guards/auth.guard';
+import { AuthGuard } from '@guards/auth';
 
 const routes: Routes = [
     {

src/app/app.component.test.ts

@@ -16,9 +16,10 @@ import { Observable } from 'rxjs';
 import { NavController } from '@ionic/angular';
 
 import { AppComponent } from '@/app/app.component';
+import { CoreApp } from '@services/app';
 import { CoreEvents } from '@singletons/events';
 import { CoreLangProvider } from '@services/lang';
-import { Network, Platform, NgZone } from '@singletons/core.singletons';
+import { Network, Platform, NgZone } from '@singletons';
 
 import { mock, mockSingleton, renderComponent, RenderConfig } from '@/testing/utils';
 
@@ -29,6 +30,7 @@ describe('AppComponent', () => {
     let config: Partial<RenderConfig>;
 
     beforeEach(() => {
+        mockSingleton(CoreApp, { setStatusBarColor: jest.fn() });
         mockSingleton(Network, { onChange: () => new Observable() });
         mockSingleton(Platform, { ready: () => Promise.resolve() });
         mockSingleton(NgZone, { run: jest.fn() });

src/app/app.component.ts

@@ -16,7 +16,7 @@ import { Component, OnInit } from '@angular/core';
 import { NavController } from '@ionic/angular';
 
 import { CoreLangProvider } from '@services/lang';
-import { CoreLoginHelperProvider } from '@features/login/services/login.helper';
+import { CoreLoginHelperProvider } from '@features/login/services/login-helper';
 import {
     CoreEvents,
     CoreEventSessionExpiredData,
@@ -24,7 +24,7 @@ import {
     CoreEventSiteData,
     CoreEventSiteUpdatedData,
 } from '@singletons/events';
-import { Network, NgZone, Platform } from '@singletons/core.singletons';
+import { Network, NgZone, Platform } from '@singletons';
 import { CoreApp } from '@services/app';
 import { CoreSites } from '@services/sites';
 

src/core/classes/site.ts

@@ -37,7 +37,7 @@ import { SQLiteDB } from '@classes/sqlitedb';
 import { CoreError } from '@classes/errors/error';
 import { CoreWSError } from '@classes/errors/wserror';
 import { CoreLogger } from '@singletons/logger';
-import { Translate } from '@singletons/core.singletons';
+import { Translate } from '@singletons';
 import { CoreIonLoadingElement } from './ion-loading';
 
 /**

src/core/classes/sqlitedb.ts

@@ -14,7 +14,7 @@
 
 import { SQLiteObject } from '@ionic-native/sqlite/ngx';
 
-import { SQLite, Platform } from '@singletons/core.singletons';
+import { SQLite, Platform } from '@singletons';
 import { CoreError } from '@classes/errors/error';
 
 /**

src/core/classes/tests/error.test.ts

@@ -38,7 +38,7 @@ describe('CoreError', () => {
         expect(error!.name).toEqual('CoreError');
         expect(error!.message).toEqual(message);
         expect(error!.stack).not.toBeNull();
-        expect(error!.stack).toContain('src/core/classes/error.test.ts');
+        expect(error!.stack).toContain('src/core/classes/tests/error.test.ts');
     });
 
     it('can be subclassed', () => {
@@ -70,7 +70,7 @@ describe('CoreError', () => {
         expect(error!.name).toEqual('CustomCoreError');
         expect(error!.message).toEqual(`Custom message: ${message}`);
         expect(error!.stack).not.toBeNull();
-        expect(error!.stack).toContain('src/core/classes/error.test.ts');
+        expect(error!.stack).toContain('src/core/classes/tests/error.test.ts');
     });
 
 });

src/core/components/components.module.ts

@@ -26,7 +26,7 @@ import { CoreInputErrorsComponent } from './input-errors/input-errors';
 import { CoreLoadingComponent } from './loading/loading';
 import { CoreMarkRequiredComponent } from './mark-required/mark-required';
 import { CoreRecaptchaComponent } from './recaptcha/recaptcha';
-import { CoreRecaptchaModalComponent } from './recaptcha/recaptchamodal';
+import { CoreRecaptchaModalComponent } from './recaptcha/recaptcha-modal';
 import { CoreShowPasswordComponent } from './show-password/show-password';
 import { CoreEmptyBoxComponent } from './empty-box/empty-box';
 import { CoreTabsComponent } from './tabs/tabs';

src/core/components/context-menu/context-menu-item.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, Input, Output, OnInit, OnDestroy, EventEmitter, OnChanges, SimpleChange } from '@angular/core';
-import { CoreContextMenuComponent } from './context-menu';
+import { CoreContextMenuComponent } from '../context-menu/context-menu';
 
 /**
  * This directive adds a item to the Context Menu popover.

src/core/components/context-menu/context-menu.ts

@@ -18,7 +18,7 @@ import { auditTime } from 'rxjs/operators';
 import { PopoverController } from '@ionic/angular';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import { Translate } from '@singletons/core.singletons';
+import { Translate } from '@singletons';
 import { CoreContextMenuItemComponent } from './context-menu-item';
 import { CoreContextMenuPopoverComponent } from './context-menu-popover';
 

src/core/components/file/file.ts

@@ -16,7 +16,7 @@ import { Component, Input, Output, OnInit, OnDestroy, EventEmitter } from '@angu
 import { CoreApp } from '@services/app';
 import { CoreFilepool } from '@services/filepool';
 import { CoreFileHelper } from '@services/file-helper';
-import { CorePluginFileDelegate } from '@services/plugin-file.delegate';
+import { CorePluginFileDelegate } from '@services/plugin-file-delegate';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';

src/core/components/input-errors/input-errors.ts

@@ -14,7 +14,7 @@
 
 import { Component, Input, OnChanges, SimpleChange } from '@angular/core';
 import { FormControl } from '@angular/forms';
-import { Translate } from '@singletons/core.singletons';
+import { Translate } from '@singletons';
 
 /**
  * Component to show errors if an input isn't valid.

src/core/components/loading/loading.ts

@@ -16,8 +16,8 @@ import { Component, Input, OnInit, OnChanges, SimpleChange, ViewChild, ElementRe
 
 import { CoreEventLoadingChangedData, CoreEvents } from '@singletons/events';
 import { CoreUtils } from '@services/utils/utils';
-import { Translate } from '@singletons/core.singletons';
 import { coreShowHideAnimation } from '@classes/animations';
+import { Translate } from '@singletons';
 
 /**
  * Component to show a loading spinner and message while data is being loaded.

src/core/components/mark-required/mark-required.ts

@@ -16,7 +16,7 @@ import { Component, Input, OnInit, AfterViewInit, ElementRef } from '@angular/co
 
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
-import { Translate } from '@singletons/core.singletons';
+import { Translate } from '@singletons';
 
 /**
  * Directive to add a red asterisk for required input fields.

src/core/components/recaptcha/recaptcha-modal.ts

@@ -14,14 +14,14 @@
 
 import { Component, Input, OnDestroy } from '@angular/core';
 
-import { ModalController } from '@singletons/core.singletons';
+import { ModalController } from '@singletons';
 
 /**
  * Component to display a the recaptcha in a modal.
  */
 @Component({
     selector: 'core-recaptcha-modal',
-    templateUrl: 'core-recaptchamodal.html',
+    templateUrl: 'core-recaptcha-modal.html',
 })
 export class CoreRecaptchaModalComponent implements OnDestroy {
 

src/core/components/recaptcha/recaptcha.ts

@@ -17,8 +17,8 @@ import { Component, Input, OnInit } from '@angular/core';
 import { CoreLang } from '@services/lang';
 import { CoreSites } from '@services/sites';
 import { CoreTextUtils } from '@services/utils/text';
-import { ModalController } from '@singletons/core.singletons';
-import { CoreRecaptchaModalComponent } from './recaptchamodal';
+import { ModalController } from '@singletons';
+import { CoreRecaptchaModalComponent } from './recaptcha-modal';
 
 /**
  * Component that allows answering a recaptcha.

src/core/components/tabs/tabs.ts

@@ -34,7 +34,7 @@ import { CoreUtils } from '@services/utils/utils';
 import { NavigationOptions } from '@ionic/angular/providers/nav-controller';
 import { Params } from '@angular/router';
 import { CoreNavBarButtonsComponent } from '../navbar-buttons/navbar-buttons';
-import { CoreDomUtils } from '@/core/services/utils/dom';
+import { CoreDomUtils } from '@services/utils/dom';
 import { StackEvent } from '@ionic/angular/directives/navigation/stack-utils';
 
 /**

src/core/core.module.ts

@@ -23,10 +23,10 @@ import { CoreInit, CoreInitDelegate } from './services/init';
 import { CoreInterceptor } from './classes/interceptor';
 import { CoreSites, CORE_SITE_SCHEMAS } from './services/sites';
 import { CoreUpdateManager } from './services/update-manager';
-import { setSingletonsInjector } from './singletons/core.singletons';
-import { SITE_SCHEMA as FILEPOOL_SITE_SCHEMA } from './services/filepool-db';
-import { SITE_SCHEMA as SITES_SITE_SCHEMA } from './services/sites-db';
-import { SITE_SCHEMA as SYNC_SITE_SCHEMA } from './services/sync-db';
+import { setSingletonsInjector } from './singletons';
+import { SITE_SCHEMA as FILEPOOL_SITE_SCHEMA } from './services/db/filepool';
+import { SITE_SCHEMA as SITES_SITE_SCHEMA } from './services/db/sites';
+import { SITE_SCHEMA as SYNC_SITE_SCHEMA } from './services/db/sync';
 
 @NgModule({
     imports: [

src/core/directives/external-content.ts

@@ -21,7 +21,7 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreUtils } from '@services/utils/utils';
-import { Platform } from '@singletons/core.singletons';
+import { Platform } from '@singletons';
 import { CoreLogger } from '@singletons/logger';
 import { CoreError } from '@classes/errors/error';
 

src/core/directives/fa-icon.ts

@@ -14,7 +14,7 @@
 
 import { Directive, ElementRef, Input, OnChanges, SimpleChange } from '@angular/core';
 import { CoreLogger } from '@singletons/logger';
-import { Http } from '@singletons/core.singletons';
+import { Http } from '@singletons';
 import { CoreConstants } from '@/core/constants';
 
 /**

src/core/directives/format-text.ts

@@ -22,7 +22,7 @@ import { CoreIframeUtils, CoreIframeUtilsProvider } from '@services/utils/iframe
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreSite } from '@classes/site';
-import { Translate } from '@singletons/core.singletons';
+import { Translate } from '@singletons';
 import { CoreExternalContentDirective } from './external-content';
 import { CoreLinkDirective } from './link';
 

src/core/directives/long-press.ts

@@ -16,7 +16,7 @@
 
 import { Directive, ElementRef, OnInit, OnDestroy, Output, EventEmitter } from '@angular/core';
 import { Gesture } from '@ionic/angular';
-import { GestureController } from '@singletons/core.singletons';
+import { GestureController } from '@singletons';
 /**
  * Directive to add long press actions to html elements.
  */

src/core/directives/tests/format-text.test.ts

@@ -25,7 +25,7 @@ import { CoreSite } from '@classes/site';
 import { CoreSites } from '@services/sites';
 import { CoreUrlUtils, CoreUrlUtilsProvider } from '@services/utils/url';
 import { CoreUtils, CoreUtilsProvider } from '@services/utils/utils';
-import { Platform } from '@singletons/core.singletons';
+import { Platform } from '@singletons';
 
 import { mock, mockSingleton, RenderConfig, renderWrapperComponent } from '@/testing/utils';
 

src/core/features/contentlinks/classes/base-handler.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Params } from '@angular/router';
-import { CoreContentLinksHandler, CoreContentLinksAction } from '../services/contentlinks.delegate';
+import { CoreContentLinksHandler, CoreContentLinksAction } from '../services/contentlinks-delegate';
 
 /**
  * Base handler to be registered in CoreContentLinksHandler. It is useful to minimize the amount of

src/core/features/contentlinks/classes/module-grade-handler.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreContentLinksAction } from '../services/contentlinks.delegate';
+import { CoreContentLinksAction } from '../services/contentlinks-delegate';
 import { CoreContentLinksHandlerBase } from './base-handler';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';

src/core/features/contentlinks/classes/module-index-handler.ts

@@ -14,7 +14,7 @@
 
 import { CoreContentLinksHandlerBase } from './base-handler';
 import { Params } from '@angular/router';
-import { CoreContentLinksAction } from '../services/contentlinks.delegate';
+import { CoreContentLinksAction } from '../services/contentlinks-delegate';
 
 /**
  * Handler to handle URLs pointing to the index of a module.

src/core/features/contentlinks/classes/module-list-handler.ts

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreContentLinksHelper } from '../services/contentlinks.helper';
+import { CoreContentLinksHelper } from '../services/contentlinks-helper';
 import { CoreContentLinksHandlerBase } from './base-handler';
-import { Translate } from '@singletons/core.singletons';
+import { Translate } from '@singletons';
 import { Params } from '@angular/router';
-import { CoreContentLinksAction } from '../services/contentlinks.delegate';
+import { CoreContentLinksAction } from '../services/contentlinks-delegate';
 
 /**
  * Handler to handle URLs pointing to a list of a certain type of modules.

src/core/features/contentlinks/pages/choose-site/choose-site.module.ts

@@ -22,7 +22,7 @@ import { RouterModule, Routes } from '@angular/router';
 import { CoreComponentsModule } from '@components/components.module';
 import { CoreDirectivesModule } from '@directives/directives.module';
 
-import { CoreContentLinksChooseSitePage } from './choose-site.page';
+import { CoreContentLinksChooseSitePage } from './choose-site';
 
 const routes: Routes = [
     {

src/core/features/contentlinks/pages/choose-site/choose-site.ts

@@ -16,10 +16,10 @@ import { Component, OnInit } from '@angular/core';
 import { NavController } from '@ionic/angular';
 import { CoreSiteBasicInfo, CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { Translate } from '@singletons/core.singletons';
-import { CoreLoginHelper } from '@features/login/services/login.helper';
-import { CoreContentLinksAction } from '../../services/contentlinks.delegate';
-import { CoreContentLinksHelper } from '../../services/contentlinks.helper';
+import { Translate } from '@singletons';
+import { CoreLoginHelper } from '@features/login/services/login-helper';
+import { CoreContentLinksAction } from '../../services/contentlinks-delegate';
+import { CoreContentLinksHelper } from '../../services/contentlinks-helper';
 import { ActivatedRoute } from '@angular/router';
 import { CoreError } from '@classes/errors/error';
 

src/core/features/contentlinks/services/contentlinks-helper.ts

@@ -17,11 +17,11 @@ import { NavController } from '@ionic/angular';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreLoginHelper } from '@features/login/services/login.helper';
-import { CoreContentLinksDelegate, CoreContentLinksAction } from './contentlinks.delegate';
+import { CoreLoginHelper } from '@features/login/services/login-helper';
+import { CoreContentLinksDelegate, CoreContentLinksAction } from './contentlinks-delegate';
 import { CoreSite } from '@classes/site';
 import { CoreMainMenu } from '@features/mainmenu/services/mainmenu';
-import { makeSingleton, NgZone, Translate } from '@singletons/core.singletons';
+import { makeSingleton, NgZone, Translate } from '@singletons';
 import { Params } from '@angular/router';
 
 /**

src/core/features/course/course.module.ts

@@ -14,12 +14,12 @@
 
 import { NgModule } from '@angular/core';
 
-import { CORE_SITE_SCHEMAS } from '@/core/services/sites';
+import { CORE_SITE_SCHEMAS } from '@services/sites';
 
 import {
     SITE_SCHEMA as COURSE_SITE_SCHEMA,
     OFFLINE_SITE_SCHEMA as COURSE_OFFLINE_SITE_SCHEMA,
-} from './services/course-db';
+} from './services/db/course';
 
 @NgModule({
     providers: [

src/core/features/course/services/course-helper.ts

@@ -18,7 +18,7 @@ import { CoreSites } from '@services/sites';
 import { CoreCourse, CoreCourseSection } from './course';
 import { CoreConstants } from '@/core/constants';
 import { CoreLogger } from '@singletons/logger';
-import { makeSingleton, Translate } from '@singletons/core.singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { CoreFilepool } from '@services/filepool';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
@@ -30,9 +30,9 @@ import {
     CoreEnrolledCourseBasicData,
     CoreEnrolledCourseData,
 } from '@features/courses/services/courses';
-import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '@features/courses/services/courses.helper';
+import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '@features/courses/services/courses-helper';
 import { CoreArray } from '@singletons/array';
-import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login.helper';
+import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login-helper';
 import { CoreIonLoadingElement } from '@classes/ion-loading';
 import { CoreCourseOffline } from './course-offline';
 

src/core/features/course/services/course-offline.ts

@@ -13,9 +13,9 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
-import { makeSingleton } from '@singletons/core.singletons';
+import { makeSingleton } from '@singletons';
 import { CoreSites } from '@services/sites';
-import { CoreCourseManualCompletionDBRecord, MANUAL_COMPLETION_TABLE } from './course-db';
+import { CoreCourseManualCompletionDBRecord, MANUAL_COMPLETION_TABLE } from './db/course';
 import { CoreStatusWithWarningsWSResponse } from '@services/ws';
 
 /**

src/core/features/course/services/course.ts

@@ -23,10 +23,10 @@ import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreSiteWSPreSets, CoreSite } from '@classes/site';
 import { CoreConstants } from '@/core/constants';
-import { makeSingleton, Translate } from '@singletons/core.singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { CoreStatusWithWarningsWSResponse, CoreWSExternalFile } from '@services/ws';
 
-import { CoreCourseStatusDBRecord, COURSE_STATUS_TABLE } from './course-db';
+import { CoreCourseStatusDBRecord, COURSE_STATUS_TABLE } from './db/course';
 import { CoreCourseOffline } from './course-offline';
 import { CoreError } from '@classes/errors/error';
 import {

src/core/features/courses/components/course-list-item/course-list-item.ts

@@ -15,7 +15,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { NavController } from '@ionic/angular';
 import { CoreCourses, CoreCourseSearchedData } from '../../services/courses';
-import { CoreCoursesHelper, CoreCourseWithImageAndColor } from '../../services/courses.helper';
+import { CoreCoursesHelper, CoreCourseWithImageAndColor } from '../../services/courses-helper';
 
 /**
  * This directive is meant to display an item for a list of courses.

src/core/features/courses/components/course-options-menu/course-options-menu.ts

@@ -15,8 +15,8 @@
 import { Component, OnInit } from '@angular/core';
 import { NavParams, PopoverController } from '@ionic/angular';
 import { CoreCourses } from '../../services/courses';
-import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses.helper';
-import { CorePrefetchStatusInfo } from '@features/course/services/course.helper';
+import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses-helper';
+import { CorePrefetchStatusInfo } from '@features/course/services/course-helper';
 
 /**
  * This component is meant to display a popover with the course options.

src/core/features/courses/components/course-progress/course-progress.ts

@@ -20,10 +20,10 @@ import { CoreDomUtils } from '@services/utils/dom';
 // import { CoreUserProvider } from '@core/user/providers/user';
 import { CoreCourses } from '@features/courses/services/courses';
 import { CoreCourse, CoreCourseProvider } from '@features/course/services/course';
-import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course.helper';
-import { Translate } from '@singletons/core.singletons';
+import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper';
+import { Translate } from '@singletons';
 import { CoreConstants } from '@/core/constants';
-import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses.helper';
+import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses-helper';
 import { CoreCoursesCourseOptionsMenuComponent } from '../course-options-menu/course-options-menu';
 
 /**

src/core/features/courses/courses.module.ts

@@ -14,21 +14,21 @@
 
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { CoreHomeRoutingModule } from '../mainmenu/pages/home/home-routing.module';
-import { CoreHomeDelegate } from '../mainmenu/services/home.delegate';
-import { CoreDashboardHomeHandler } from './services/handlers/dashboard.home';
+import { CoreHomeRoutingModule } from '@features/mainmenu/pages/home/home-routing.module';
+import { CoreHomeDelegate } from '@features/mainmenu/services/home-delegate';
+import { CoreDashboardHomeHandler } from './services/handlers/dashboard-home';
 import { CoreCoursesMyCoursesHomeHandler } from './services/handlers/my-courses.home';
 
 const homeRoutes: Routes = [
     {
         path: 'dashboard',
         loadChildren: () =>
-            import('@features/courses/pages/dashboard/dashboard.page.module').then(m => m.CoreCoursesDashboardPageModule),
+            import('@features/courses/pages/dashboard/dashboard.module').then(m => m.CoreCoursesDashboardPageModule),
     },
     {
         path: 'courses/my',
         loadChildren: () =>
-            import('@features/courses/pages/my-courses/my-courses.page.module')
+            import('@features/courses/pages/my-courses/my-courses.module')
                 .then(m => m.CoreCoursesMyCoursesPageModule),
     },
 ];
@@ -50,31 +50,31 @@ const routes: Routes = [
             {
                 path: 'categories/:id',
                 loadChildren: () =>
-                    import('@features/courses/pages/categories/categories.page.module')
+                    import('@features/courses/pages/categories/categories.module')
                         .then(m => m.CoreCoursesCategoriesPageModule),
             },
             {
                 path: 'all',
                 loadChildren: () =>
-                    import('@features/courses/pages/available-courses/available-courses.page.module')
+                    import('@features/courses/pages/available-courses/available-courses.module')
                         .then(m => m.CoreCoursesAvailableCoursesPageModule),
             },
             {
                 path: 'search',
                 loadChildren: () =>
-                    import('@features/courses/pages/search/search.page.module')
+                    import('@features/courses/pages/search/search.module')
                         .then(m => m.CoreCoursesSearchPageModule),
             },
             {
                 path: 'my',
                 loadChildren: () =>
-                    import('@features/courses/pages/my-courses/my-courses.page.module')
+                    import('@features/courses/pages/my-courses/my-courses.module')
                         .then(m => m.CoreCoursesMyCoursesPageModule),
             },
             {
                 path: 'preview',
                 loadChildren: () =>
-                    import('@features/courses/pages/course-preview/course-preview.page.module')
+                    import('@features/courses/pages/course-preview/course-preview.module')
                         .then(m => m.CoreCoursesCoursePreviewPageModule),
             },
         ],

src/core/features/courses/pages/available-courses/available-courses.module.ts

@@ -22,7 +22,7 @@ import { CoreComponentsModule } from '@components/components.module';
 import { CoreDirectivesModule } from '@directives/directives.module';
 import { CoreCoursesComponentsModule } from '../../components/components.module';
 
-import { CoreCoursesAvailableCoursesPage } from './available-courses.page';
+import { CoreCoursesAvailableCoursesPage } from './available-courses';
 
 
 const routes: Routes = [

src/core/features/courses/pages/categories/categories.module.ts

@@ -22,7 +22,7 @@ import { CoreComponentsModule } from '@components/components.module';
 import { CoreDirectivesModule } from '@directives/directives.module';
 import { CoreCoursesComponentsModule } from '../../components/components.module';
 
-import { CoreCoursesCategoriesPage } from './categories.page';
+import { CoreCoursesCategoriesPage } from './categories';
 
 
 const routes: Routes = [

src/core/features/courses/pages/categories/categories.ts

@@ -18,7 +18,7 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreCategoryData, CoreCourses, CoreCourseSearchedData } from '../../services/courses';
-import { Translate } from '@singletons/core.singletons';
+import { Translate } from '@singletons';
 import { ActivatedRoute } from '@angular/router';
 
 /**

src/core/features/courses/pages/course-preview/course-preview.module.ts

@@ -22,7 +22,7 @@ import { CoreComponentsModule } from '@components/components.module';
 import { CoreDirectivesModule } from '@directives/directives.module';
 import { CorePipesModule } from '@pipes/pipes.module';
 
-import { CoreCoursesCoursePreviewPage } from './course-preview.page';
+import { CoreCoursesCoursePreviewPage } from './course-preview';
 import { CoreCoursesComponentsModule } from '../../components/components.module';
 
 const routes: Routes = [

src/core/features/courses/pages/course-preview/course-preview.ts

@@ -29,8 +29,8 @@ import {
 } from '@features/courses/services/courses';
 // import { CoreCourseOptionsDelegate } from '@features/course/services/options-delegate';
 import { CoreCourse, CoreCourseProvider } from '@features/course/services/course';
-import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course.helper';
-import { Translate } from '@singletons/core.singletons';
+import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper';
+import { Translate } from '@singletons';
 import { ActivatedRoute } from '@angular/router';
 import { CoreConstants } from '@/core/constants';
 import { CoreCoursesSelfEnrolPasswordComponent } from '../../components/self-enrol-password/self-enrol-password';

src/core/features/courses/pages/dashboard/dashboard.module.ts

@@ -21,7 +21,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { CoreComponentsModule } from '@components/components.module';
 import { CoreDirectivesModule } from '@directives/directives.module';
 
-import { CoreCoursesDashboardPage } from './dashboard.page';
+import { CoreCoursesDashboardPage } from './dashboard';
 
 const routes: Routes = [
     {

src/core/features/courses/pages/my-courses/my-courses.module.ts

@@ -22,7 +22,7 @@ import { FormsModule } from '@angular/forms';
 import { CoreComponentsModule } from '@components/components.module';
 import { CoreDirectivesModule } from '@directives/directives.module';
 
-import { CoreCoursesMyCoursesPage } from './my-courses.page';
+import { CoreCoursesMyCoursesPage } from './my-courses';
 import { CoreCoursesComponentsModule } from '../../components/components.module';
 
 const routes: Routes = [

src/core/features/courses/pages/my-courses/my-courses.ts

@@ -22,8 +22,8 @@ import {
     CoreCoursesMyCoursesUpdatedEventData,
     CoreCourses,
 } from '../../services/courses';
-import { CoreCoursesHelper, CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses.helper';
-import { CoreCourseHelper } from '@features/course/services/course.helper';
+import { CoreCoursesHelper, CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses-helper';
+import { CoreCourseHelper } from '@features/course/services/course-helper';
 import { CoreConstants } from '@/core/constants';
 // import { CoreCourseOptionsDelegate } from '@core/course/services/options-delegate';
 

src/core/features/courses/pages/search/search.module.ts

@@ -23,7 +23,7 @@ import { CoreDirectivesModule } from '@directives/directives.module';
 import { CoreCoursesComponentsModule } from '../../components/components.module';
 import { CoreSearchComponentsModule } from '@features/search/components/components.module';
 
-import { CoreCoursesSearchPage } from './search.page';
+import { CoreCoursesSearchPage } from './search';
 
 const routes: Routes = [
     {
@@ -49,4 +49,3 @@ const routes: Routes = [
     exports: [RouterModule],
 })
 export class CoreCoursesSearchPageModule { }
-

src/core/features/courses/services/courses-helper.ts

@@ -17,7 +17,7 @@ import { Injectable } from '@angular/core';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreSites } from '@services/sites';
 import { CoreCourses, CoreCourseSearchedData, CoreCourseUserAdminOrNavOptionIndexed, CoreEnrolledCourseData } from './courses';
-import { makeSingleton } from '@singletons/core.singletons';
+import { makeSingleton } from '@singletons';
 import { CoreWSExternalFile } from '@services/ws';
 // import { AddonCourseCompletionProvider } from '@addon/coursecompletion/providers/coursecompletion';
 // import { CoreCoursePickerMenuPopoverComponent } from '@components/course-picker-menu/course-picker-menu-popover';
@@ -214,4 +214,3 @@ export type CoreEnrolledCourseDataWithOptions = CoreEnrolledCourseData & {
  * Enrolled course data with admin and navigation option availability and extra rendering info.
  */
 export type CoreEnrolledCourseDataWithExtraInfoAndOptions = CoreEnrolledCourseDataWithExtraInfo & CoreEnrolledCourseDataWithOptions;
-

src/core/features/courses/services/courses.ts

@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import { CoreLogger } from '@singletons/logger';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
-import { makeSingleton } from '@singletons/core.singletons';
+import { makeSingleton } from '@singletons';
 import { CoreStatusWithWarningsWSResponse, CoreWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
 import { CoreEvents } from '@singletons/events';
 import { CoreWSError } from '@classes/errors/wserror';

src/core/features/courses/services/handlers/dashboard-home.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
-import { CoreHomeHandler, CoreHomeHandlerToDisplay } from '@features/mainmenu/services/home.delegate';
+import { CoreHomeHandler, CoreHomeHandlerToDisplay } from '@features/mainmenu/services/home-delegate';
 
 /**
  * Handler to add dashboard into home page.

src/core/features/courses/services/handlers/my-courses.home.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
-import { CoreHomeHandler, CoreHomeHandlerToDisplay } from '@features/mainmenu/services/home.delegate';
+import { CoreHomeHandler, CoreHomeHandlerToDisplay } from '@features/mainmenu/services/home-delegate';
 
 /**
  * Handler to add my courses into home page.

src/core/features/emulator/components/capture-media/capture-media.ts

@@ -23,7 +23,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
-import { Platform, ModalController, Media, Translate } from '@singletons/core.singletons';
+import { Platform, ModalController, Media, Translate } from '@singletons';
 import { CoreError } from '@classes/errors/error';
 import { CoreCaptureError } from '@classes/errors/captureerror';
 import { CoreCanceledError } from '@classes/errors/cancelederror';

src/core/features/emulator/emulator.module.ts

@@ -16,7 +16,7 @@ import { NgModule } from '@angular/core';
 import { Platform } from '@ionic/angular';
 
 import { CoreInitDelegate } from '@services/init';
-import { CoreEmulatorHelperProvider } from './services/emulator.helper';
+import { CoreEmulatorHelperProvider } from './services/emulator-helper';
 import { CoreEmulatorComponentsModule } from './components/components.module';
 
 // Ionic Native services.

src/core/features/emulator/services/camera.ts

@@ -15,7 +15,7 @@
 import { Injectable } from '@angular/core';
 import { Camera, CameraOptions } from '@ionic-native/camera/ngx';
 
-import { CoreEmulatorCaptureHelper } from './capture.helper';
+import { CoreEmulatorCaptureHelper } from './capture-helper';
 
 /**
  * Emulates the Cordova Camera plugin in browser.

src/core/features/emulator/services/capture-helper.ts

@@ -17,7 +17,7 @@ import { CameraOptions } from '@ionic-native/camera/ngx';
 import { CaptureAudioOptions, CaptureImageOptions, CaptureVideoOptions, MediaFile } from '@ionic-native/media-capture/ngx';
 
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
-import { makeSingleton, ModalController } from '@singletons/core.singletons';
+import { makeSingleton, ModalController } from '@singletons';
 import { CaptureMediaComponentInputs, CoreEmulatorCaptureMediaComponent } from '../components/capture-media/capture-media';
 
 /**

src/core/features/emulator/services/media-capture.ts

@@ -21,7 +21,7 @@ import {
     MediaFile,
 } from '@ionic-native/media-capture/ngx';
 
-import { CoreEmulatorCaptureHelper } from './capture.helper';
+import { CoreEmulatorCaptureHelper } from './capture-helper';
 
 /**
  * Emulates the Cordova MediaCapture plugin in browser.

src/core/features/fileuploader/fileuploader-init.module.ts

@@ -14,7 +14,7 @@
 
 import { NgModule } from '@angular/core';
 
-import { CoreFileUploaderDelegate } from './services/fileuploader.delegate';
+import { CoreFileUploaderDelegate } from './services/fileuploader-delegate';
 import { CoreFileUploaderAlbumHandler } from './services/handlers/album';
 import { CoreFileUploaderAudioHandler } from './services/handlers/audio';
 import { CoreFileUploaderCameraHandler } from './services/handlers/camera';

src/core/features/fileuploader/services/fileuploader-helper.ts

@@ -25,12 +25,12 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils, PromiseDefer } from '@services/utils/utils';
-import { makeSingleton, Translate, Camera, Chooser, Platform, ActionSheetController } from '@singletons/core.singletons';
+import { makeSingleton, Translate, Camera, Chooser, Platform, ActionSheetController } from '@singletons';
 import { CoreLogger } from '@singletons/logger';
 import { CoreCanceledError } from '@classes/errors/cancelederror';
 import { CoreError } from '@classes/errors/error';
 import { CoreFileUploader, CoreFileUploaderProvider, CoreFileUploaderOptions } from './fileuploader';
-import { CoreFileUploaderDelegate } from './fileuploader.delegate';
+import { CoreFileUploaderDelegate } from './fileuploader-delegate';
 import { CoreCaptureError } from '@classes/errors/captureerror';
 import { CoreIonLoadingElement } from '@classes/ion-loading';
 import { CoreWSUploadFileResult } from '@services/ws';

src/core/features/fileuploader/services/fileuploader.ts

@@ -27,7 +27,7 @@ import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile, CoreWSFileUploadOptions, CoreWSUploadFileResult } from '@services/ws';
-import { makeSingleton, Translate, MediaCapture, ModalController, Camera } from '@singletons/core.singletons';
+import { makeSingleton, Translate, MediaCapture, ModalController, Camera } from '@singletons';
 import { CoreLogger } from '@singletons/logger';
 import { CoreEmulatorCaptureMediaComponent } from '@features/emulator/components/capture-media/capture-media';
 import { CoreError } from '@classes/errors/error';

src/core/features/fileuploader/services/handlers/album.ts

@@ -16,8 +16,8 @@ import { Injectable } from '@angular/core';
 
 import { CoreApp } from '@services/app';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader.delegate';
-import { CoreFileUploaderHelper } from '../fileuploader.helper';
+import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader-delegate';
+import { CoreFileUploaderHelper } from '../fileuploader-helper';
 
 /**
  * Handler to upload files from the album.

src/core/features/fileuploader/services/handlers/audio.ts

@@ -16,8 +16,8 @@ import { Injectable } from '@angular/core';
 
 import { CoreApp } from '@services/app';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader.delegate';
-import { CoreFileUploaderHelper } from '../fileuploader.helper';
+import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader-delegate';
+import { CoreFileUploaderHelper } from '../fileuploader-helper';
 /**
  * Handler to record an audio to upload it.
  */

src/core/features/fileuploader/services/handlers/camera.ts

@@ -16,8 +16,8 @@ import { Injectable } from '@angular/core';
 
 import { CoreApp } from '@services/app';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader.delegate';
-import { CoreFileUploaderHelper } from '../fileuploader.helper';
+import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader-delegate';
+import { CoreFileUploaderHelper } from '../fileuploader-helper';
 
 /**
  * Handler to take a picture to upload it.

src/core/features/fileuploader/services/handlers/file.ts

@@ -16,10 +16,10 @@ import { Injectable } from '@angular/core';
 
 import { CoreApp } from '@services/app';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader.delegate';
-import { CoreFileUploaderHelper } from '../fileuploader.helper';
+import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader-delegate';
+import { CoreFileUploaderHelper } from '../fileuploader-helper';
 import { CoreFileUploader } from '../fileuploader';
-import { Translate } from '@singletons/core.singletons';
+import { Translate } from '@singletons';
 
 /**
  * Handler to upload any type of file.

src/core/features/fileuploader/services/handlers/video.ts

@@ -16,8 +16,8 @@ import { Injectable } from '@angular/core';
 
 import { CoreApp } from '@services/app';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader.delegate';
-import { CoreFileUploaderHelper } from '../fileuploader.helper';
+import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader-delegate';
+import { CoreFileUploaderHelper } from '../fileuploader-helper';
 /**
  * Handler to record a video to upload it.
  */

src/core/features/login/components/site-help/site-help.ts

@@ -15,8 +15,8 @@
 import { Component } from '@angular/core';
 
 import { CoreUtils } from '@services/utils/utils';
-import { ModalController, Translate } from '@singletons/core.singletons';
-import { CoreLoginHelperProvider } from '@features/login/services/login.helper';
+import { ModalController, Translate } from '@singletons';
+import { CoreLoginHelperProvider } from '@features/login/services/login-helper';
 
 /**
  * Component that displays help to connect to a site.

src/core/features/login/components/site-onboarding/site-onboarding.ts

@@ -16,8 +16,8 @@ import { Component } from '@angular/core';
 
 import { CoreConfig } from '@services/config';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreLoginHelperProvider } from '@features/login/services/login.helper';
-import { ModalController } from '@singletons/core.singletons';
+import { CoreLoginHelperProvider } from '@features/login/services/login-helper';
+import { ModalController } from '@singletons';
 
 /**
  * Component that displays onboarding help regarding the CoreLoginSitePage.

src/core/features/login/login-routing.module.ts

@@ -23,41 +23,41 @@ const routes: Routes = [
     },
     {
         path: 'init',
-        loadChildren: () => import('./pages/init/init.page.module').then( m => m.CoreLoginInitPageModule),
+        loadChildren: () => import('./pages/init/init.module').then( m => m.CoreLoginInitPageModule),
     },
     {
         path: 'site',
-        loadChildren: () => import('./pages/site/site.page.module').then( m => m.CoreLoginSitePageModule),
+        loadChildren: () => import('./pages/site/site.module').then( m => m.CoreLoginSitePageModule),
     },
     {
         path: 'credentials',
-        loadChildren: () => import('./pages/credentials/credentials.page.module').then( m => m.CoreLoginCredentialsPageModule),
+        loadChildren: () => import('./pages/credentials/credentials.module').then( m => m.CoreLoginCredentialsPageModule),
     },
     {
         path: 'sites',
-        loadChildren: () => import('./pages/sites/sites.page.module').then( m => m.CoreLoginSitesPageModule),
+        loadChildren: () => import('./pages/sites/sites.module').then( m => m.CoreLoginSitesPageModule),
     },
     {
         path: 'forgottenpassword',
-        loadChildren: () => import('./pages/forgotten-password/forgotten-password.page.module')
+        loadChildren: () => import('./pages/forgotten-password/forgotten-password.module')
             .then( m => m.CoreLoginForgottenPasswordPageModule),
     },
     {
         path: 'changepassword',
-        loadChildren: () => import('./pages/change-password/change-password.page.module')
+        loadChildren: () => import('./pages/change-password/change-password.module')
             .then( m => m.CoreLoginChangePasswordPageModule),
     },
     {
         path: 'sitepolicy',
-        loadChildren: () => import('./pages/site-policy/site-policy.page.module').then( m => m.CoreLoginSitePolicyPageModule),
+        loadChildren: () => import('./pages/site-policy/site-policy.module').then( m => m.CoreLoginSitePolicyPageModule),
     },
     {
         path: 'emailsignup',
-        loadChildren: () => import('./pages/email-signup/email-signup.page.module').then( m => m.CoreLoginEmailSignupPageModule),
+        loadChildren: () => import('./pages/email-signup/email-signup.module').then( m => m.CoreLoginEmailSignupPageModule),
     },
     {
         path: 'reconnect',
-        loadChildren: () => import('./pages/reconnect/reconnect.page.module').then( m => m.CoreLoginReconnectPageModule),
+        loadChildren: () => import('./pages/reconnect/reconnect.module').then( m => m.CoreLoginReconnectPageModule),
     },
 ];
 

src/core/features/login/pages/change-password/change-password.module.ts

@@ -19,7 +19,7 @@ import { IonicModule } from '@ionic/angular';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { CoreDirectivesModule } from '@directives/directives.module';
-import { CoreLoginChangePasswordPage } from './change-password.page';
+import { CoreLoginChangePasswordPage } from './change-password';
 
 const routes: Routes = [
     {

src/core/features/login/pages/change-password/change-password.ts

@@ -16,8 +16,8 @@ import { Component } from '@angular/core';
 
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreLoginHelper } from '@features/login/services/login.helper';
-import { Translate } from '@singletons/core.singletons';
+import { CoreLoginHelper } from '@features/login/services/login-helper';
+import { Translate } from '@singletons';
 
 /**
  * Page that shows instructions to change the password.

src/core/features/login/pages/credentials/credentials.module.ts

@@ -22,7 +22,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { CoreComponentsModule } from '@components/components.module';
 import { CoreDirectivesModule } from '@directives/directives.module';
 
-import { CoreLoginCredentialsPage } from './credentials.page';
+import { CoreLoginCredentialsPage } from './credentials';
 
 const routes: Routes = [
     {

src/core/features/login/pages/credentials/credentials.ts

@@ -21,9 +21,9 @@ import { CoreApp } from '@services/app';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login.helper';
+import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login-helper';
 import { CoreConstants } from '@/core/constants';
-import { Translate } from '@singletons/core.singletons';
+import { Translate } from '@singletons';
 import { CoreSiteIdentityProvider, CoreSitePublicConfigResponse } from '@classes/site';
 import { CoreEvents } from '@singletons/events';
 

src/core/features/login/pages/email-signup/email-signup.module.ts

@@ -22,7 +22,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { CoreComponentsModule } from '@components/components.module';
 import { CoreDirectivesModule } from '@directives/directives.module';
 
-import { CoreLoginEmailSignupPage } from './email-signup.page';
+import { CoreLoginEmailSignupPage } from './email-signup';
 
 const routes: Routes = [
     {

src/core/features/login/pages/email-signup/email-signup.ts

@@ -23,14 +23,14 @@ import { CoreTextUtils } from '@services/utils/text';
 import { CoreCountry, CoreUtils } from '@services/utils/utils';
 import { CoreWS, CoreWSExternalWarning } from '@services/ws';
 import { CoreConstants } from '@/core/constants';
-import { Translate } from '@singletons/core.singletons';
+import { Translate } from '@singletons';
 import { CoreSitePublicConfigResponse } from '@classes/site';
 
 import {
     AuthEmailSignupProfileFieldsCategory,
     AuthEmailSignupSettings,
     CoreLoginHelper,
-} from '@features/login/services/login.helper';
+} from '@features/login/services/login-helper';
 
 /**
  * Page to signup using email.

src/core/features/login/pages/forgotten-password/forgotten-password.module.ts

@@ -20,7 +20,7 @@ import { IonicModule } from '@ionic/angular';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { CoreDirectivesModule } from '@directives/directives.module';
-import { CoreLoginForgottenPasswordPage } from './forgotten-password.page';
+import { CoreLoginForgottenPasswordPage } from './forgotten-password';
 
 const routes: Routes = [
     {

src/core/features/login/pages/forgotten-password/forgotten-password.ts

@@ -18,8 +18,8 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { NavController } from '@ionic/angular';
 
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreLoginHelper } from '@features/login/services/login.helper';
-import { Translate, Platform } from '@singletons/core.singletons';
+import { CoreLoginHelper } from '@features/login/services/login-helper';
+import { Translate, Platform } from '@singletons';
 import { CoreWSExternalWarning } from '@services/ws';
 
 /**

src/core/features/login/pages/init/init.module.ts

@@ -16,7 +16,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { IonicModule } from '@ionic/angular';
 
-import { CoreLoginInitPage } from './init.page';
+import { CoreLoginInitPage } from './init';
 
 const routes: Routes = [
     {

src/core/features/login/pages/init/init.ts

@@ -17,10 +17,10 @@ import { NavController } from '@ionic/angular';
 
 import { CoreApp, CoreRedirectData } from '@services/app';
 import { CoreInit } from '@services/init';
-import { SplashScreen } from '@singletons/core.singletons';
+import { SplashScreen } from '@singletons';
 import { CoreConstants } from '@/core/constants';
 import { CoreSites } from '@services/sites';
-import { CoreLoginHelper } from '@features/login/services/login.helper';
+import { CoreLoginHelper } from '@features/login/services/login-helper';
 
 /**
  * Page that displays a "splash screen" while the app is being initialized.

src/core/features/login/pages/reconnect/reconnect.module.ts

@@ -22,7 +22,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { CoreComponentsModule } from '@components/components.module';
 import { CoreDirectivesModule } from '@directives/directives.module';
 
-import { CoreLoginReconnectPage } from './reconnect.page';
+import { CoreLoginReconnectPage } from './reconnect';
 
 const routes: Routes = [
     {

src/core/features/login/pages/reconnect/reconnect.ts

@@ -21,7 +21,7 @@ import { CoreApp } from '@services/app';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreLoginHelper } from '@features/login/services/login.helper';
+import { CoreLoginHelper } from '@features/login/services/login-helper';
 import { CoreSiteIdentityProvider, CoreSitePublicConfigResponse } from '@classes/site';
 import { CoreEvents } from '@singletons/events';
 import { CoreError } from '@classes/errors/error';

src/core/features/login/pages/site-policy/site-policy.module.ts

@@ -20,7 +20,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { CoreComponentsModule } from '@components/components.module';
 import { CoreDirectivesModule } from '@directives/directives.module';
-import { CoreLoginSitePolicyPage } from './site-policy.page';
+import { CoreLoginSitePolicyPage } from './site-policy';
 
 const routes: Routes = [
     {

src/core/features/login/pages/site-policy/site-policy.ts

@@ -20,7 +20,7 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
-import { CoreLoginHelper } from '@features/login/services/login.helper';
+import { CoreLoginHelper } from '@features/login/services/login-helper';
 import { CoreSite } from '@classes/site';
 
 /**

src/core/features/login/pages/site/site.module.ts

@@ -22,7 +22,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { CoreComponentsModule } from '@components/components.module';
 import { CoreDirectivesModule } from '@directives/directives.module';
 
-import { CoreLoginSitePage } from './site.page';
+import { CoreLoginSitePage } from './site';
 
 const routes: Routes = [
     {

src/core/features/login/pages/site/site.ts

@@ -22,11 +22,11 @@ import { CoreConfig } from '@services/config';
 import { CoreSites, CoreSiteCheckResponse, CoreLoginSiteInfo, CoreSitesDemoSiteData } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login.helper';
+import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login-helper';
 import { CoreSite } from '@classes/site';
 import { CoreError } from '@classes/errors/error';
 import { CoreConstants } from '@/core/constants';
-import { Translate, ModalController } from '@singletons/core.singletons';
+import { Translate, ModalController } from '@singletons';
 import { CoreUrl } from '@singletons/url';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreLoginSiteHelpComponent } from '@features/login/components/site-help/site-help';

src/core/features/login/pages/sites/sites.module.ts

@@ -21,7 +21,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { CoreComponentsModule } from '@components/components.module';
 import { CoreDirectivesModule } from '@directives/directives.module';
 
-import { CoreLoginSitesPage } from './sites.page';
+import { CoreLoginSitesPage } from './sites';
 
 const routes: Routes = [
     {

src/core/features/login/pages/sites/sites.ts

@@ -18,7 +18,7 @@ import { Component, OnInit } from '@angular/core';
 
 import { CoreSiteBasicInfo, CoreSites } from '@services/sites';
 import { CoreLogger } from '@singletons/logger';
-import { CoreLoginHelper } from '@features/login/services/login.helper';
+import { CoreLoginHelper } from '@features/login/services/login-helper';
 
 /**
  * Page that displays a "splash screen" while the app is being initialized.