diff --git a/client/src/infrastructure/custom_error.ts b/client/infrastructure/custom_error.ts
similarity index 100%
rename from client/src/infrastructure/custom_error.ts
rename to client/infrastructure/custom_error.ts
diff --git a/client/src/infrastructure/electron/app_paths.ts b/client/infrastructure/electron/app_paths.ts
similarity index 100%
rename from client/src/infrastructure/electron/app_paths.ts
rename to client/infrastructure/electron/app_paths.ts
diff --git a/client/src/infrastructure/i18n.ts b/client/infrastructure/i18n.ts
similarity index 100%
rename from client/src/infrastructure/i18n.ts
rename to client/infrastructure/i18n.ts
diff --git a/client/src/infrastructure/memory_storage.ts b/client/infrastructure/memory_storage.ts
similarity index 100%
rename from client/src/infrastructure/memory_storage.ts
rename to client/infrastructure/memory_storage.ts
diff --git a/client/src/infrastructure/timeout_promise.ts b/client/infrastructure/timeout_promise.ts
similarity index 100%
rename from client/src/infrastructure/timeout_promise.ts
rename to client/infrastructure/timeout_promise.ts
diff --git a/client/src/www/app/app.ts b/client/src/www/app/app.ts
index 341d9f3eb3..faad30953f 100644
--- a/client/src/www/app/app.ts
+++ b/client/src/www/app/app.ts
@@ -15,7 +15,7 @@
 import * as errors from '../model/errors';
 import * as events from '../model/events';
 import {Server} from '../model/server';
-import {OperationTimedOut} from '../../infrastructure/timeout_promise';
+import {OperationTimedOut} from '../../../infrastructure/timeout_promise';
 import {ServerListItem, ServerConnectionState} from '../views/servers_view';
 import {SERVER_CONNECTION_INDICATOR_DURATION_MS} from '../views/servers_view/server_connection_indicator';
 
@@ -27,7 +27,7 @@ import {Settings, SettingsKey} from './settings';
 import {Updater} from './updater';
 import {UrlInterceptor} from './url_interceptor';
 import {VpnInstaller} from './vpn_installer';
-import {Localizer} from 'src/infrastructure/i18n';
+import {Localizer} from '../../../infrastructure/i18n';
 
 enum OUTLINE_ACCESS_KEY_SCHEME {
   STATIC = 'ss',
diff --git a/client/src/www/model/errors.ts b/client/src/www/model/errors.ts
index 09fef3ab9b..adc49d79a3 100644
--- a/client/src/www/model/errors.ts
+++ b/client/src/www/model/errors.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import {Server} from './server';
-import {CustomError} from '../../infrastructure/custom_error';
+import {CustomError} from '../../../infrastructure/custom_error';
 
 export class ServerAlreadyAdded extends CustomError {
   constructor(public readonly server: Server) {
diff --git a/client/tsconfig.json b/client/tsconfig.json
index f6dbb97233..581d8b92cf 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -17,5 +17,5 @@
     "lib": ["es2022"]
   },
   "exclude": ["*.cjs", "*.js", "*.mjs", "**/*.spec.ts"],
-  "include": ["src"]
+  "include": ["src", "infrastructure"]
 }