organized files inside comp

app/scripts/app.js

@@ -5,20 +5,20 @@ const AppSettingsModel = require('./models/app-settings-model');
 const UpdateModel = require('./models/update-model');
 const RuntimeDataModel = require('./models/runtime-data-model');
 const FileInfoCollection = require('./collections/file-info-collection');
-const KeyHandler = require('./comp/key-handler');
-const IdleTracker = require('./comp/idle-tracker');
-const PopupNotifier = require('./comp/popup-notifier');
-const SingleInstanceChecker = require('./comp/single-instance-checker');
-const AppRightsChecker = require('./comp/app-rights-checker');
-const Alerts = require('./comp/alerts');
-const Updater = require('./comp/updater');
-const AuthReceiver = require('./comp/auth-receiver');
-const ExportApi = require('./comp/export-api');
-const SettingsManager = require('./comp/settings-manager');
+const KeyHandler = require('./comp/browser/key-handler');
+const IdleTracker = require('./comp/browser/idle-tracker');
+const PopupNotifier = require('./comp/browser/popup-notifier');
+const SingleInstanceChecker = require('./comp/app/single-instance-checker');
+const AppRightsChecker = require('./comp/app/app-rights-checker');
+const Alerts = require('./comp/ui/alerts');
+const Updater = require('./comp/app/updater');
+const AuthReceiver = require('./comp/browser/auth-receiver');
+const ExportApi = require('./comp/app/export-api');
+const SettingsManager = require('./comp/settings/settings-manager');
 const PluginManager = require('./plugins/plugin-manager');
 const Launcher = require('./comp/launcher');
-const FeatureTester = require('./comp/feature-tester');
-const FocusDetector = require('./comp/focus-detector');
+const FeatureTester = require('./comp/browser/feature-tester');
+const FocusDetector = require('./comp/browser/focus-detector');
 const Timeouts = require('./const/timeouts');
 const Features = require('./util/features');
 const KdbxwebInit = require('./util/kdbxweb/kdbxweb-init');

app/scripts/auto-type/index.js

@@ -3,7 +3,7 @@ const AutoTypeParser = require('./auto-type-parser');
 const AutoTypeFilter = require('./auto-type-filter');
 const AutoTypeHelperFactory = require('./auto-type-helper-factory');
 const Launcher = require('../comp/launcher');
-const Alerts = require('../comp/alerts');
+const Alerts = require('../comp/ui/alerts');
 const AutoTypeSelectView = require('../views/auto-type/auto-type-select-view');
 const Logger = require('../util/logger');
 const Locale = require('../util/locale');

app/scripts/collections/file-info-collection.js

@@ -1,6 +1,6 @@
 const Backbone = require('backbone');
 const FileInfoModel = require('../models/file-info-model');
-const SettingsStore = require('../comp/settings-store');
+const SettingsStore = require('../comp/settings/settings-store');
 
 const FileInfoCollection = Backbone.Collection.extend({
     model: FileInfoModel,

app/scripts/comp/app/app-rights-checker.js

@@ -1,8 +1,8 @@
-const Features = require('../util/features');
-const Alerts = require('../comp/alerts');
-const AppSettingsModel = require('../models/app-settings-model');
-const Launcher = require('./launcher');
-const Locale = require('../util/locale');
+const Features = require('../../util/features');
+const Alerts = require('../ui/alerts');
+const AppSettingsModel = require('../../models/app-settings-model');
+const Launcher = require('../launcher');
+const Locale = require('../../util/locale');
 
 const AppRightsChecker = {
     AppPath: '/Applications/KeeWeb.app',

app/scripts/comp/app/dropbox-chooser.js

@@ -1,4 +1,4 @@
-const AppSettingsModel = require('../models/app-settings-model');
+const AppSettingsModel = require('../../models/app-settings-model');
 
 const ChooserAppKey = 'qp7ctun6qt5n9d6';
 

app/scripts/comp/app/export-api.js

@@ -1,4 +1,4 @@
-const AppSettingsModel = require('../models/app-settings-model');
+const AppSettingsModel = require('../../models/app-settings-model');
 
 const ExportApi = {
     settings: {

app/scripts/comp/app/generator-presets.js

@@ -1,5 +1,5 @@
-const AppSettingsModel = require('../models/app-settings-model');
-const Locale = require('../util/locale');
+const AppSettingsModel = require('../../models/app-settings-model');
+const Locale = require('../../util/locale');
 
 const GeneratorPresets = {
     get defaultPreset() {

app/scripts/comp/app/runtime-info.js

@@ -1,4 +1,4 @@
-const Launcher = require('../comp/launcher');
+const Launcher = require('../launcher');
 
 const RuntimeInfo = {
     version: '@@VERSION',

app/scripts/comp/app/shortcuts.js

@@ -1,8 +1,8 @@
-const Features = require('../util/features');
-const Keys = require('../const/keys');
-const StringFormat = require('../util/formatting/string-format');
-const AppSettingsModel = require('../models/app-settings-model');
-const Launcher = require('./launcher');
+const Features = require('../../util/features');
+const Keys = require('../../const/keys');
+const StringFormat = require('../../util/formatting/string-format');
+const AppSettingsModel = require('../../models/app-settings-model');
+const Launcher = require('../launcher');
 
 let allowedKeys;
 

app/scripts/comp/app/single-instance-checker.js

@@ -1,5 +1,5 @@
 const Backbone = require('backbone');
-const Launcher = require('./launcher');
+const Launcher = require('../launcher');
 
 const LocalStorageKeyName = 'instanceCheck';
 const LocalStorageResponseKeyName = 'instanceMaster';

app/scripts/comp/app/updater.js

@@ -1,12 +1,12 @@
 const Backbone = require('backbone');
-const RuntimeInfo = require('./runtime-info');
-const Links = require('../const/links');
-const Launcher = require('../comp/launcher');
-const AppSettingsModel = require('../models/app-settings-model');
-const UpdateModel = require('../models/update-model');
-const Transport = require('../comp/transport');
-const Logger = require('../util/logger');
-const SemVer = require('../util/data/semver');
+const RuntimeInfo = require('../app/runtime-info');
+const Links = require('../../const/links');
+const Launcher = require('../launcher');
+const AppSettingsModel = require('../../models/app-settings-model');
+const UpdateModel = require('../../models/update-model');
+const Transport = require('../browser/transport');
+const Logger = require('../../util/logger');
+const SemVer = require('../../util/data/semver');
 const publicKey = require('public-key.pem').default;
 
 const logger = new Logger('updater');

app/scripts/comp/browser/auth-receiver.js

@@ -1,5 +1,5 @@
-const Features = require('../util/features');
-const Storage = require('../storage');
+const Features = require('../../util/features');
+const Storage = require('../../storage');
 
 const AuthReceiver = {
     receive() {

app/scripts/comp/browser/copy-paste.js

@@ -1,6 +1,6 @@
 const Backbone = require('backbone');
-const Launcher = require('./launcher');
-const AppSettingsModel = require('../models/app-settings-model');
+const Launcher = require('../launcher');
+const AppSettingsModel = require('../../models/app-settings-model');
 
 const CopyPaste = {
     simpleCopy: !!(Launcher && Launcher.clipboardSupported),

app/scripts/comp/browser/feature-tester.js

@@ -1,5 +1,5 @@
 const kdbxweb = require('kdbxweb');
-const Features = require('../util/features');
+const Features = require('../../util/features');
 
 const FeatureTester = {
     test() {

app/scripts/comp/browser/focus-detector.js

@@ -1,6 +1,6 @@
 const Backbone = require('backbone');
-const Features = require('../util/features');
-const Launcher = require('../comp/launcher');
+const Features = require('../../util/features');
+const Launcher = require('../launcher');
 
 const FocusDetector = {
     init() {

app/scripts/comp/browser/idle-tracker.js

@@ -1,5 +1,5 @@
 const Backbone = require('backbone');
-const AppSettingsModel = require('../models/app-settings-model');
+const AppSettingsModel = require('../../models/app-settings-model');
 
 const IdleTracker = {
     actionTime: Date.now(),

app/scripts/comp/browser/key-handler.js

@@ -1,6 +1,6 @@
 const Backbone = require('backbone');
-const Keys = require('../const/keys');
-const IdleTracker = require('../comp/idle-tracker');
+const Keys = require('../../const/keys');
+const IdleTracker = require('./idle-tracker');
 
 const shortcutKeyProp = navigator.platform.indexOf('Mac') >= 0 ? 'metaKey' : 'ctrlKey';
 

app/scripts/comp/browser/popup-notifier.js

@@ -1,11 +1,11 @@
 const Backbone = require('backbone');
-const Alerts = require('./alerts');
-const Launcher = require('./launcher');
+const Alerts = require('../ui/alerts');
+const Launcher = require('../launcher');
 const AuthReceiver = require('./auth-receiver');
-const Links = require('../const/links');
-const Timeouts = require('../const/timeouts');
-const Locale = require('../util/locale');
-const Logger = require('../util/logger');
+const Links = require('../../const/links');
+const Timeouts = require('../../const/timeouts');
+const Locale = require('../../util/locale');
+const Logger = require('../../util/logger');
 
 const PopupNotifier = {
     logger: null,

app/scripts/comp/browser/transport.js

@@ -1,5 +1,5 @@
-const Launcher = require('./launcher');
-const Logger = require('../util/logger');
+const Launcher = require('../launcher');
+const Logger = require('../../util/logger');
 
 const logger = new Logger('transport');
 

app/scripts/comp/format/kdbx-to-html.js

@@ -1,10 +1,10 @@
 const kdbxweb = require('kdbxweb');
-const StringFormat = require('../util/formatting/string-format');
-const DateFormat = require('../util/formatting/date-format');
-const Locale = require('../util/locale');
-const MdToHtml = require('../util/formatting/md-to-html');
-const Links = require('../const/links');
-const RuntimeInfo = require('./runtime-info');
+const StringFormat = require('../../util/formatting/string-format');
+const DateFormat = require('../../util/formatting/date-format');
+const Locale = require('../../util/locale');
+const MdToHtml = require('../../util/formatting/md-to-html');
+const Links = require('../../const/links');
+const RuntimeInfo = require('../app/runtime-info');
 
 const Templates = {
     db: require('templates/export/db.hbs'),

app/scripts/comp/format/otp-qr-reader.js

@@ -1,10 +1,10 @@
 const Backbone = require('backbone');
-const Alerts = require('./alerts');
-const Locale = require('../util/locale');
-const Logger = require('../util/logger');
-const Features = require('../util/features');
-const Shortcuts = require('../comp/shortcuts');
-const Otp = require('../util/data/otp');
+const Alerts = require('../ui/alerts');
+const Locale = require('../../util/locale');
+const Logger = require('../../util/logger');
+const Features = require('../../util/features');
+const Shortcuts = require('../../comp/app/shortcuts');
+const Otp = require('../../util/data/otp');
 const QrCode = require('jsqrcode');
 
 const logger = new Logger('otp-qr-reader');

app/scripts/comp/settings/settings-manager.js

@@ -1,6 +1,6 @@
 const Backbone = require('backbone');
-const Locale = require('./../util/locale');
-const Features = require('../util/features');
+const Locale = require('../../util/locale');
+const Features = require('../../util/features');
 
 const appleThemes = {
     macdark: 'setGenThemeMacDark'

app/scripts/comp/settings/settings-store.js

@@ -1,6 +1,6 @@
-const Launcher = require('./launcher');
-const StringFormat = require('../util/formatting/string-format');
-const Logger = require('../util/logger');
+const Launcher = require('../launcher');
+const StringFormat = require('../../util/formatting/string-format');
+const Logger = require('../../util/logger');
 
 const logger = new Logger('settings');
 

app/scripts/comp/ui/alerts.js

@@ -1,5 +1,5 @@
-const ModalView = require('../views/modal-view');
-const Locale = require('../util/locale');
+const ModalView = require('../../views/modal-view');
+const Locale = require('../../util/locale');
 
 const Alerts = {
     alertDisplayed: false,

app/scripts/models/app-model.js

@@ -17,7 +17,7 @@ const DateFormat = require('../util/formatting/date-format');
 const UrlFormat = require('../util/formatting/url-format');
 const AutoType = require('../auto-type');
 const Launcher = require('../comp/launcher');
-const RuntimeInfo = require('../comp/runtime-info');
+const RuntimeInfo = require('../comp/app/runtime-info');
 const PluginManager = require('../plugins/plugin-manager');
 const Locale = require('../util/locale');
 

app/scripts/models/app-settings-model.js

@@ -1,5 +1,5 @@
 const Backbone = require('backbone');
-const SettingsStore = require('../comp/settings-store');
+const SettingsStore = require('../comp/settings/settings-store');
 
 const AppSettingsModel = Backbone.Model.extend({
     defaults: {

app/scripts/models/entry-model.js

@@ -6,7 +6,7 @@ const IconUrlFormat = require('../util/formatting/icon-url-format');
 const Otp = require('../util/data/otp');
 const kdbxweb = require('kdbxweb');
 const Ranking = require('../util/data/ranking');
-const KdbxToHtml = require('../comp/kdbx-to-html');
+const KdbxToHtml = require('../comp/format/kdbx-to-html');
 
 const EntryModel = Backbone.Model.extend({
     defaults: {},

app/scripts/models/file-model.js

@@ -3,7 +3,7 @@ const GroupCollection = require('../collections/group-collection');
 const GroupModel = require('./group-model');
 const IconUrlFormat = require('../util/formatting/icon-url-format');
 const Logger = require('../util/logger');
-const KdbxToHtml = require('../comp/kdbx-to-html');
+const KdbxToHtml = require('../comp/format/kdbx-to-html');
 const kdbxweb = require('kdbxweb');
 const demoFileData = require('demo.kdbx');
 

app/scripts/models/runtime-data-model.js

@@ -1,5 +1,5 @@
 const Backbone = require('backbone');
-const SettingsStore = require('../comp/settings-store');
+const SettingsStore = require('../comp/settings/settings-store');
 
 const RuntimeDataModel = Backbone.Model.extend({
     defaults: {},

app/scripts/models/update-model.js

@@ -1,5 +1,5 @@
 const Backbone = require('backbone');
-const SettingsStore = require('../comp/settings-store');
+const SettingsStore = require('../comp/settings/settings-store');
 
 const UpdateModel = Backbone.Model.extend({
     defaults: {

app/scripts/plugins/plugin-gallery.js

@@ -3,7 +3,7 @@ const kdbxweb = require('kdbxweb');
 const Links = require('../const/links');
 const SignatureVerifier = require('../util/data/signature-verifier');
 const Logger = require('../util/logger');
-const SettingsStore = require('../comp/settings-store');
+const SettingsStore = require('../comp/settings/settings-store');
 
 const PluginGallery = {
     logger: new Logger('plugin-gallery'),

app/scripts/plugins/plugin-manager.js

@@ -2,8 +2,8 @@ const Backbone = require('backbone');
 const Plugin = require('./plugin');
 const PluginCollection = require('./plugin-collection');
 const PluginGallery = require('./plugin-gallery');
-const SettingsStore = require('../comp/settings-store');
-const RuntimeInfo = require('../comp/runtime-info');
+const SettingsStore = require('../comp/settings/settings-store');
+const RuntimeInfo = require('../comp/app/runtime-info');
 const SignatureVerifier = require('../util/data/signature-verifier');
 const Logger = require('../util/logger');
 

app/scripts/plugins/plugin.js

@@ -3,13 +3,13 @@ const Backbone = require('backbone');
 const PluginApi = require('./plugin-api');
 const ThemeVars = require('./theme-vars');
 const Logger = require('../util/logger');
-const SettingsManager = require('../comp/settings-manager');
+const SettingsManager = require('../comp/settings/settings-manager');
 const IoCache = require('../storage/io-cache');
 const AppSettingsModel = require('../models/app-settings-model');
 const BaseLocale = require('../locales/base.json');
 const SignatureVerifier = require('../util/data/signature-verifier');
 const SemVer = require('../util/data/semver');
-const RuntimeInfo = require('../comp/runtime-info');
+const RuntimeInfo = require('../comp/app/runtime-info');
 
 const commonLogger = new Logger('plugin');
 const io = new IoCache({

app/scripts/views/app-view.js

@@ -12,13 +12,13 @@ const OpenView = require('../views/open-view');
 const SettingsView = require('../views/settings/settings-view');
 const KeyChangeView = require('../views/key-change-view');
 const DropdownView = require('../views/dropdown-view');
-const Alerts = require('../comp/alerts');
+const Alerts = require('../comp/ui/alerts');
 const Keys = require('../const/keys');
 const Timeouts = require('../const/timeouts');
-const KeyHandler = require('../comp/key-handler');
-const IdleTracker = require('../comp/idle-tracker');
+const KeyHandler = require('../comp/browser/key-handler');
+const IdleTracker = require('../comp/browser/idle-tracker');
 const Launcher = require('../comp/launcher');
-const SettingsManager = require('../comp/settings-manager');
+const SettingsManager = require('../comp/settings/settings-manager');
 const Locale = require('../util/locale');
 const Features = require('../util/features');
 const UpdateModel = require('../models/update-model');

app/scripts/views/auto-type/auto-type-select-view.js

@@ -1,11 +1,11 @@
 const Backbone = require('backbone');
 const Keys = require('../../const/keys');
-const KeyHandler = require('../../comp/key-handler');
+const KeyHandler = require('../../comp/browser/key-handler');
 const Locale = require('../../util/locale');
 const AppSettingsModel = require('../../models/app-settings-model');
 const EntryPresenter = require('../../presenters/entry-presenter');
 const Scrollable = require('../../mixins/scrollable');
-const Shortcuts = require('../../comp/shortcuts');
+const Shortcuts = require('../../comp/app/shortcuts');
 const DropdownView = require('../dropdown-view');
 const StringFormat = require('../../util/formatting/string-format');
 

app/scripts/views/details/details-attachment-view.js

@@ -1,5 +1,5 @@
 const Backbone = require('backbone');
-const Shortcuts = require('../../comp/shortcuts');
+const Shortcuts = require('../../comp/app/shortcuts');
 
 const DetailsAttachmentView = Backbone.View.extend({
     template: require('templates/details/details-attachment.hbs'),

app/scripts/views/details/details-auto-type-view.js

@@ -1,7 +1,7 @@
 const Backbone = require('backbone');
 const AutoTypeHintView = require('../auto-type-hint-view');
 const Locale = require('../../util/locale');
-const Shortcuts = require('../../comp/shortcuts');
+const Shortcuts = require('../../comp/app/shortcuts');
 const AutoType = require('../../auto-type');
 
 const DetailsAutoTypeView = Backbone.View.extend({

app/scripts/views/details/details-history-view.js

@@ -1,10 +1,10 @@
 const Backbone = require('backbone');
-const KeyHandler = require('../../comp/key-handler');
+const KeyHandler = require('../../comp/browser/key-handler');
 const Keys = require('../../const/keys');
 const DateFormat = require('../../util/formatting/date-format');
 const StringFormat = require('../../util/formatting/string-format');
 const Locale = require('../../util/locale');
-const Alerts = require('../../comp/alerts');
+const Alerts = require('../../comp/ui/alerts');
 const FieldViewReadOnly = require('../fields/field-view-read-only');
 const FieldViewReadOnlyRaw = require('../fields/field-view-read-only-raw');
 const Copyable = require('../../mixins/copyable');

app/scripts/views/details/details-view.js

@@ -20,10 +20,10 @@ const DetailsAddFieldView = require('./details-add-field-view');
 const DetailsAutoTypeView = require('./details-auto-type-view');
 const DropdownView = require('../../views/dropdown-view');
 const Keys = require('../../const/keys');
-const KeyHandler = require('../../comp/key-handler');
-const Alerts = require('../../comp/alerts');
-const CopyPaste = require('../../comp/copy-paste');
-const OtpQrReader = require('../../comp/otp-qr-reader');
+const KeyHandler = require('../../comp/browser/key-handler');
+const Alerts = require('../../comp/ui/alerts');
+const CopyPaste = require('../../comp/browser/copy-paste');
+const OtpQrReader = require('../../comp/format/otp-qr-reader');
 const AutoType = require('../../auto-type');
 const StringFormat = require('../../util/formatting/string-format');
 const DateFormat = require('../../util/formatting/date-format');

app/scripts/views/dropdown-view.js

@@ -1,6 +1,6 @@
 const Backbone = require('backbone');
 const Keys = require('../const/keys');
-const KeyHandler = require('../comp/key-handler');
+const KeyHandler = require('../comp/browser/key-handler');
 
 const DropdownView = Backbone.View.extend({
     template: require('templates/dropdown.hbs'),

app/scripts/views/fields/field-view-text.js

@@ -2,7 +2,7 @@ const Backbone = require('backbone');
 const kdbxweb = require('kdbxweb');
 const FieldView = require('./field-view');
 const GeneratorView = require('../generator-view');
-const KeyHandler = require('../../comp/key-handler');
+const KeyHandler = require('../../comp/browser/key-handler');
 const Keys = require('../../const/keys');
 const PasswordGenerator = require('../../util/generators/password-generator');
 const Features = require('../../util/features');

app/scripts/views/fields/field-view.js

@@ -1,5 +1,5 @@
 const Backbone = require('backbone');
-const CopyPaste = require('../../comp/copy-paste');
+const CopyPaste = require('../../comp/browser/copy-paste');
 const Tip = require('../../util/ui/tip');
 
 const FieldView = Backbone.View.extend({

app/scripts/views/footer-view.js

@@ -1,6 +1,6 @@
 const Backbone = require('backbone');
 const Keys = require('../const/keys');
-const KeyHandler = require('../comp/key-handler');
+const KeyHandler = require('../comp/browser/key-handler');
 const GeneratorView = require('./generator-view');
 const UpdateModel = require('../models/update-model');
 

app/scripts/views/generator-presets-view.js

@@ -1,7 +1,7 @@
 const Backbone = require('backbone');
 const Scrollable = require('../mixins/scrollable');
 const Locale = require('../util/locale');
-const GeneratorPresets = require('../comp/generator-presets');
+const GeneratorPresets = require('../comp/app/generator-presets');
 const PasswordGenerator = require('../util/generators/password-generator');
 
 const GeneratorPresetsView = Backbone.View.extend({

app/scripts/views/generator-view.js

@@ -1,8 +1,8 @@
 const Backbone = require('backbone');
 const PasswordGenerator = require('../util/generators/password-generator');
-const CopyPaste = require('../comp/copy-paste');
+const CopyPaste = require('../comp/browser/copy-paste');
 const AppSettingsModel = require('../models/app-settings-model');
-const GeneratorPresets = require('../comp/generator-presets');
+const GeneratorPresets = require('../comp/app/generator-presets');
 const Locale = require('../util/locale');
 const Tip = require('../util/ui/tip');
 

app/scripts/views/key-change-view.js

@@ -1,6 +1,6 @@
 const Backbone = require('backbone');
-const SecureInput = require('../comp/secure-input');
-const Alerts = require('../comp/alerts');
+const SecureInput = require('../comp/browser/secure-input');
+const Alerts = require('../comp/ui/alerts');
 const Locale = require('../util/locale');
 const InputFx = require('../util/ui/input-fx');
 const Keys = require('../const/keys');

app/scripts/views/list-search-view.js

@@ -1,9 +1,9 @@
 const Backbone = require('backbone');
 const Keys = require('../const/keys');
-const KeyHandler = require('../comp/key-handler');
+const KeyHandler = require('../comp/browser/key-handler');
 const DropdownView = require('./dropdown-view');
 const Features = require('../util/features');
-const Shortcuts = require('../comp/shortcuts');
+const Shortcuts = require('../comp/app/shortcuts');
 const StringFormat = require('../util/formatting/string-format');
 const Locale = require('../util/locale');
 const Comparators = require('../util/data/comparators');

app/scripts/views/list-view.js

@@ -5,11 +5,11 @@ const Scrollable = require('../mixins/scrollable');
 const ListSearchView = require('./list-search-view');
 const DropdownView = require('./dropdown-view');
 const EntryPresenter = require('../presenters/entry-presenter');
-const DragDropInfo = require('../comp/drag-drop-info');
+const DragDropInfo = require('../comp/app/drag-drop-info');
 const AppSettingsModel = require('../models/app-settings-model');
 const Locale = require('../util/locale');
 const StringFormat = require('../util/formatting/string-format');
-const Alerts = require('../comp/alerts');
+const Alerts = require('../comp/ui/alerts');
 
 const ListView = Backbone.View.extend({
     template: require('templates/list.hbs'),

app/scripts/views/menu/menu-item-view.js

@@ -1,8 +1,8 @@
 const Backbone = require('backbone');
-const KeyHandler = require('../../comp/key-handler');
+const KeyHandler = require('../../comp/browser/key-handler');
 const Keys = require('../../const/keys');
-const Alerts = require('../../comp/alerts');
-const DragDropInfo = require('../../comp/drag-drop-info');
+const Alerts = require('../../comp/ui/alerts');
+const DragDropInfo = require('../../comp/app/drag-drop-info');
 const Locale = require('../../util/locale');
 
 const MenuItemView = Backbone.View.extend({

app/scripts/views/menu/menu-view.js

@@ -1,6 +1,6 @@
 const Backbone = require('backbone');
 const Keys = require('../../const/keys');
-const KeyHandler = require('../../comp/key-handler');
+const KeyHandler = require('../../comp/browser/key-handler');
 const Resizable = require('../../mixins/resizable');
 const MenuSectionView = require('./menu-section-view');
 const DragView = require('../drag-view');

app/scripts/views/modal-view.js

@@ -1,6 +1,6 @@
 const Backbone = require('backbone');
 const Keys = require('../const/keys');
-const KeyHandler = require('../comp/key-handler');
+const KeyHandler = require('../comp/browser/key-handler');
 
 const ModalView = Backbone.View.extend({
     el: 'body',

app/scripts/views/open-view.js

@@ -2,10 +2,10 @@ const Backbone = require('backbone');
 const kdbxweb = require('kdbxweb');
 const OpenConfigView = require('./open-config-view');
 const Keys = require('../const/keys');
-const Alerts = require('../comp/alerts');
-const SecureInput = require('../comp/secure-input');
-const DropboxChooser = require('../comp/dropbox-chooser');
-const KeyHandler = require('../comp/key-handler');
+const Alerts = require('../comp/ui/alerts');
+const SecureInput = require('../comp/browser/secure-input');
+const DropboxChooser = require('../comp/app/dropbox-chooser');
+const KeyHandler = require('../comp/browser/key-handler');
 const StorageFileListView = require('../views/storage-file-list-view');
 const Logger = require('../util/logger');
 const Locale = require('../util/locale');
@@ -14,7 +14,7 @@ const InputFx = require('../util/ui/input-fx');
 const Comparators = require('../util/data/comparators');
 const Storage = require('../storage');
 const Launcher = require('../comp/launcher');
-const FocusDetector = require('../comp/focus-detector');
+const FocusDetector = require('../comp/browser/focus-detector');
 const Features = require('../util/features');
 
 const logger = new Logger('open-view');

app/scripts/views/settings/settings-about-view.js

@@ -1,5 +1,5 @@
 const Backbone = require('backbone');
-const RuntimeInfo = require('../../comp/runtime-info');
+const RuntimeInfo = require('../../comp/app/runtime-info');
 const Links = require('../../const/links');
 
 const SettingsAboutView = Backbone.View.extend({

app/scripts/views/settings/settings-file-view.js

@@ -1,8 +1,8 @@
 const Backbone = require('backbone');
 const OpenConfigView = require('../open-config-view');
-const Shortcuts = require('../../comp/shortcuts');
+const Shortcuts = require('../../comp/app/shortcuts');
 const PasswordGenerator = require('../../util/generators/password-generator');
-const Alerts = require('../../comp/alerts');
+const Alerts = require('../../comp/ui/alerts');
 const Launcher = require('../../comp/launcher');
 const Storage = require('../../storage');
 const Links = require('../../const/links');

app/scripts/views/settings/settings-general-view.js

@@ -2,13 +2,13 @@ const Backbone = require('backbone');
 const SettingsPrvView = require('./settings-prv-view');
 const SettingsLogsView = require('./settings-logs-view');
 const Launcher = require('../../comp/launcher');
-const Updater = require('../../comp/updater');
+const Updater = require('../../comp/app/updater');
 const DateFormat = require('../../util/formatting/date-format');
 const AppSettingsModel = require('../../models/app-settings-model');
 const UpdateModel = require('../../models/update-model');
-const RuntimeInfo = require('../../comp/runtime-info');
-const Alerts = require('../../comp/alerts');
-const SettingsManager = require('../../comp/settings-manager');
+const RuntimeInfo = require('../../comp/app/runtime-info');
+const Alerts = require('../../comp/ui/alerts');
+const SettingsManager = require('../../comp/settings/settings-manager');
 const Storage = require('../../storage');
 const Features = require('../../util/features');
 const Locale = require('../../util/locale');

app/scripts/views/settings/settings-help-view.js

@@ -1,5 +1,5 @@
 const Backbone = require('backbone');
-const RuntimeInfo = require('../../comp/runtime-info');
+const RuntimeInfo = require('../../comp/app/runtime-info');
 const Links = require('../../const/links');
 
 const SettingsHelpView = Backbone.View.extend({

app/scripts/views/settings/settings-plugins-view.js

@@ -5,10 +5,10 @@ const PluginGallery = require('../../plugins/plugin-gallery');
 const AppSettingsModel = require('../../models/app-settings-model');
 const Comparators = require('../../util/data/comparators');
 const DateFormat = require('../../util/formatting/date-format');
-const SettingsManager = require('../../comp/settings-manager');
+const SettingsManager = require('../../comp/settings/settings-manager');
 const Features = require('../../util/features');
 const SemVer = require('../../util/data/semver');
-const RuntimeInfo = require('../../comp/runtime-info');
+const RuntimeInfo = require('../../comp/app/runtime-info');
 const Links = require('../../const/links');
 
 const SettingsPluginsView = Backbone.View.extend({

app/scripts/views/settings/settings-shortcuts-view.js

@@ -2,7 +2,7 @@ const Backbone = require('backbone');
 const Locale = require('../../util/locale');
 const Keys = require('../../const/keys');
 const Launcher = require('../../comp/launcher');
-const Shortcuts = require('../../comp/shortcuts');
+const Shortcuts = require('../../comp/app/shortcuts');
 const Features = require('../../util/features');
 
 const SettingsShortcutsView = Backbone.View.extend({

app/scripts/views/settings/settings-view.js

@@ -1,7 +1,7 @@
 const Backbone = require('backbone');
 const Scrollable = require('../../mixins/scrollable');
 const Keys = require('../../const/keys');
-const KeyHandler = require('../../comp/key-handler');
+const KeyHandler = require('../../comp/browser/key-handler');
 
 const SettingsView = Backbone.View.extend({
     template: require('templates/settings/settings.hbs'),

app/scripts/views/tag-view.js

@@ -1,6 +1,6 @@
 const Backbone = require('backbone');
 const Locale = require('../util/locale');
-const Alerts = require('../comp/alerts');
+const Alerts = require('../comp/ui/alerts');
 
 const TagView = Backbone.View.extend({
     template: require('templates/tag.hbs'),