diff --git a/application/Makefile b/application/Makefile
index b073630..9d0a932 100644
--- a/application/Makefile
+++ b/application/Makefile
@@ -32,7 +32,6 @@ APP_MIME_SIG = application/x-vnd.caya.Caya
 #	same name (source.c or source.cpp) are included from different directories.
 #	Also note that spaces in folder names do not work well with this Makefile.
 SRCS = \
-	application/AboutWindow.cpp \
 	application/Account.cpp \
 	application/AccountManager.cpp \
 	application/CayaProtocolAddOn.cpp \
@@ -41,14 +40,11 @@ SRCS = \
 	application/Conversation.cpp \
 	application/EditingFilter.cpp \
 	application/ImageCache.cpp \
-	application/JoinWindow.cpp \
 	application/Main.cpp \
-	application/MainWindow.cpp \
 	application/Notifier.cpp \
 	application/ProtocolLooper.cpp \
 	application/ProtocolManager.cpp \
 	application/ProtocolSettings.cpp \
-	application/RosterWindow.cpp \
 	application/Server.cpp \
 	application/TheApp.cpp \
 	application/User.cpp \
@@ -56,11 +52,11 @@ SRCS = \
 	application/preferences/AccountListItem.cpp \
 	application/preferences/AccountView.cpp \
 	application/preferences/CayaPreferences.cpp \
+	application/preferences/PreferencesChatWindow.cpp \
 	application/preferences/PreferencesDialog.cpp \
 	application/preferences/PreferencesAccounts.cpp \
 	application/preferences/PreferencesBehavior.cpp \
 	application/preferences/PreferencesReplicant.cpp \
-	application/preferences/PreferencesChatWindow.cpp \
 	application/views/CayaRenderView.cpp \
 	application/views/ConversationItem.cpp \
 	application/views/ConversationListView.cpp \
@@ -74,10 +70,14 @@ SRCS = \
 	application/views/SearchBarTextControl.cpp \
 	application/views/StatusMenuItem.cpp \
 	application/views/StatusView.cpp \
-	application/views/UserInfoWindow.cpp \
 	application/views/UserItem.cpp \
 	application/views/UserListView.cpp \
-	application/views/UserPopUp.cpp
+	application/views/UserPopUp.cpp \
+	application/windows/AboutWindow.cpp \
+	application/windows/JoinWindow.cpp \
+	application/windows/MainWindow.cpp \
+	application/windows/RosterWindow.cpp \
+	application/windows/UserInfoWindow.cpp
 
 
 #	Specify the resource definition files to use. Full or relative paths can be
diff --git a/application/AboutWindow.cpp b/application/windows/AboutWindow.cpp
similarity index 100%
rename from application/AboutWindow.cpp
rename to application/windows/AboutWindow.cpp
diff --git a/application/AboutWindow.h b/application/windows/AboutWindow.h
similarity index 100%
rename from application/AboutWindow.h
rename to application/windows/AboutWindow.h
diff --git a/application/JoinWindow.cpp b/application/windows/JoinWindow.cpp
similarity index 100%
rename from application/JoinWindow.cpp
rename to application/windows/JoinWindow.cpp
diff --git a/application/JoinWindow.h b/application/windows/JoinWindow.h
similarity index 100%
rename from application/JoinWindow.h
rename to application/windows/JoinWindow.h
diff --git a/application/MainWindow.cpp b/application/windows/MainWindow.cpp
similarity index 100%
rename from application/MainWindow.cpp
rename to application/windows/MainWindow.cpp
diff --git a/application/MainWindow.h b/application/windows/MainWindow.h
similarity index 100%
rename from application/MainWindow.h
rename to application/windows/MainWindow.h
diff --git a/application/RosterWindow.cpp b/application/windows/RosterWindow.cpp
similarity index 100%
rename from application/RosterWindow.cpp
rename to application/windows/RosterWindow.cpp
diff --git a/application/RosterWindow.h b/application/windows/RosterWindow.h
similarity index 100%
rename from application/RosterWindow.h
rename to application/windows/RosterWindow.h
diff --git a/application/views/UserInfoWindow.cpp b/application/windows/UserInfoWindow.cpp
similarity index 100%
rename from application/views/UserInfoWindow.cpp
rename to application/windows/UserInfoWindow.cpp
diff --git a/application/views/UserInfoWindow.h b/application/windows/UserInfoWindow.h
similarity index 100%
rename from application/views/UserInfoWindow.h
rename to application/windows/UserInfoWindow.h