diff --git a/src/extension.ts b/src/extension.ts
index 516ad01..229140f 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -17,7 +17,6 @@ import {
     shouldEnableEffect,
     windowScaleFactor,
 } from './manager/utils.js';
-import {WindowPicker} from './preferences/window_picker/service.js';
 import {
     disableBackgroundMenuItem,
     enableBackgroundMenuItem,
@@ -25,6 +24,7 @@ import {
 import {OVERVIEW_SHADOW_ACTOR, SHADOW_PADDING} from './utils/constants.js';
 import {logDebug} from './utils/log.js';
 import {getPref, initPrefs, prefs, uninitPrefs} from './utils/settings.js';
+import {WindowPicker} from './window_picker/service.js';
 
 // types, which will be removed in output
 import type Gio from 'gi://Gio';
diff --git a/src/preferences/widgets/app_row.ts b/src/preferences/widgets/app_row.ts
index 6b4c5bd..d8cafad 100644
--- a/src/preferences/widgets/app_row.ts
+++ b/src/preferences/widgets/app_row.ts
@@ -3,7 +3,7 @@ import GObject from 'gi://GObject';
 import Gtk from 'gi://Gtk';
 
 import {gettext as _} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
-import {onPicked, pick} from '../window_picker/client.js';
+import {onPicked, pick} from '../../window_picker/client.js';
 
 export class AppRowClass extends Adw.ExpanderRow {
     private callbacks?: AppRowCallbacks;
diff --git a/src/preferences/window_picker/README.md b/src/window_picker/README.md
similarity index 100%
rename from src/preferences/window_picker/README.md
rename to src/window_picker/README.md
diff --git a/src/preferences/window_picker/client.ts b/src/window_picker/client.ts
similarity index 100%
rename from src/preferences/window_picker/client.ts
rename to src/window_picker/client.ts
diff --git a/src/preferences/window_picker/iface.xml b/src/window_picker/iface.xml
similarity index 100%
rename from src/preferences/window_picker/iface.xml
rename to src/window_picker/iface.xml
diff --git a/src/preferences/window_picker/service.ts b/src/window_picker/service.ts
similarity index 96%
rename from src/preferences/window_picker/service.ts
rename to src/window_picker/service.ts
index a1d090f..734471d 100644
--- a/src/preferences/window_picker/service.ts
+++ b/src/window_picker/service.ts
@@ -10,8 +10,8 @@ import Meta from 'gi://Meta';
 import {Inspector} from 'resource:///org/gnome/shell/ui/lookingGlass.js';
 import * as Main from 'resource:///org/gnome/shell/ui/main.js';
 
-import {readRelativeFile} from '../../utils/file.js';
-import {logDebug} from '../../utils/log.js';
+import {readRelativeFile} from '../utils/file.js';
+import {logDebug} from '../utils/log.js';
 
 /**
  * This class provides the implementation of the DBus interface for the window