diff --git a/gajim/app_actions.py b/gajim/app_actions.py
index 1ab8b4390..64ad736d7 100644
--- a/gajim/app_actions.py
+++ b/gajim/app_actions.py
@@ -23,10 +23,10 @@ from gajim.common.app import interface
 from gajim.common.exceptions import GajimGeneralException
 from gajim import config
 from gajim import dialogs
-from gajim.accounts_window import AccountsWindow
-import gajim.plugins.gui
 from gajim import disco
 
+import gajim.plugins.gui
+
 from gajim.gtk.dialogs import ShortcutsWindow
 from gajim.gtk.history_sync import HistorySyncAssistant
 from gajim.gtk.server_info import ServerInfoDialog
@@ -43,6 +43,7 @@ from gajim.gtk.bookmarks import ManageBookmarksWindow
 from gajim.gtk.features import FeaturesDialog
 from gajim.gtk.account_wizard import AccountCreationWizard
 from gajim.gtk.history import HistoryWindow
+from gajim.gtk.accounts import AccountsWindow
 
 
 # General Actions
diff --git a/gajim/gtk/account_wizard.py b/gajim/gtk/account_wizard.py
index aa74663ca..28b94a10c 100644
--- a/gajim/gtk/account_wizard.py
+++ b/gajim/gtk/account_wizard.py
@@ -482,7 +482,7 @@ class AccountCreationWizard:
             GLib.source_remove(self.update_progressbar_timeout_id)
 
     def on_advanced_button_clicked(self, widget):
-        from gajim.accounts_window import AccountsWindow
+        from gajim.gtk.accounts import AccountsWindow
         window = app.get_app_window(AccountsWindow)
         if window is None:
             window = AccountsWindow()
diff --git a/gajim/accounts_window.py b/gajim/gtk/accounts.py
similarity index 97%
rename from gajim/accounts_window.py
rename to gajim/gtk/accounts.py
index 432452bc4..ca8b550ad 100644
--- a/gajim/accounts_window.py
+++ b/gajim/gtk/accounts.py
@@ -1,18 +1,36 @@
+# This file is part of Gajim.
+#
+# Gajim is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published
+# by the Free Software Foundation; version 3 only.
+#
+# Gajim is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Gajim. If not, see <http://www.gnu.org/licenses/>.
+
 from functools import partial
 
-from gi.repository import Gtk, GLib, Gdk
+from gi.repository import Gtk
+from gi.repository import Gdk
+from gi.repository import GLib
 
-from gajim.common import app
 from gajim import gtkgui_helpers
 from gajim import gui_menu_builder
-from gajim.common import passwords
 from gajim import config
+from gajim.options_dialog import OptionsDialog, OptionsBox
+
+from gajim.common import app
+from gajim.common import passwords
 from gajim.common import helpers
 from gajim.common import ged
 from gajim.common.connection import Connection
 from gajim.common.zeroconf.connection_zeroconf import ConnectionZeroconf
-from gajim.options_dialog import OptionsDialog, OptionsBox
 from gajim.common.const import Option, OptionKind, OptionType
+
 from gajim.gtk.dialogs import ConfirmationDialog
 from gajim.gtk.dialogs import YesNoDialog
 
diff --git a/gajim/roster_window.py b/gajim/roster_window.py
index 1d6b09431..1815868d2 100644
--- a/gajim/roster_window.py
+++ b/gajim/roster_window.py
@@ -53,7 +53,6 @@ from gajim import cell_renderer_image
 from gajim import tooltips
 from gajim import message_control
 from gajim import adhoc_commands
-from gajim.accounts_window import AccountsWindow
 
 from gajim.common import app
 from gajim.common import helpers
@@ -81,6 +80,7 @@ from gajim.gtk.bookmarks import ManageBookmarksWindow
 from gajim.gtk.account_wizard import AccountCreationWizard
 from gajim.gtk.service_registration import ServiceRegistration
 from gajim.gtk.history import HistoryWindow
+from gajim.gtk.accounts import AccountsWindow
 
 
 log = logging.getLogger('gajim.roster')