diff --git a/SparkleShare/Linux/UserInterface/About.cs b/SparkleShare/Linux/About.cs
similarity index 100%
rename from SparkleShare/Linux/UserInterface/About.cs
rename to SparkleShare/Linux/About.cs
diff --git a/SparkleShare/Linux/UserInterface/Bubbles.cs b/SparkleShare/Linux/Bubbles.cs
similarity index 100%
rename from SparkleShare/Linux/UserInterface/Bubbles.cs
rename to SparkleShare/Linux/Bubbles.cs
diff --git a/SparkleShare/Linux/UserInterface/EventLog.cs b/SparkleShare/Linux/EventLog.cs
similarity index 100%
rename from SparkleShare/Linux/UserInterface/EventLog.cs
rename to SparkleShare/Linux/EventLog.cs
diff --git a/SparkleShare/Linux/Makefile.am b/SparkleShare/Linux/Makefile.am
index 0cae5e87..f56def66 100644
--- a/SparkleShare/Linux/Makefile.am
+++ b/SparkleShare/Linux/Makefile.am
@@ -19,15 +19,15 @@ SOURCES =  \
 	../Common/NoteController.cs \
 	../Common/SetupController.cs \
 	../Common/StatusIconController.cs \
-	Userinterface/About.cs \
-	Userinterface/Bubbles.cs \
-	Userinterface/EventLog.cs \
-	Userinterface/Note.cs \
-	Userinterface/Setup.cs \
-	Userinterface/SetupWindow.cs \
-	Userinterface/StatusIcon.cs \
-	Userinterface/UserInterface.cs \
-	Userinterface/UserInterfaceHelpers.cs \
+        About.cs \
+        Bubbles.cs \
+        EventLog.cs \
+        Note.cs \
+        Setup.cs \
+        SetupWindow.cs \
+        StatusIcon.cs \
+        UserInterface.cs \
+        UserInterfaceHelpers.cs \
 	Controller.cs
 
 include $(top_srcdir)/build/build.mk
diff --git a/SparkleShare/Linux/UserInterface/Setup.cs b/SparkleShare/Linux/Setup.cs
similarity index 100%
rename from SparkleShare/Linux/UserInterface/Setup.cs
rename to SparkleShare/Linux/Setup.cs
diff --git a/SparkleShare/Linux/UserInterface/SetupWindow.cs b/SparkleShare/Linux/SetupWindow.cs
similarity index 100%
rename from SparkleShare/Linux/UserInterface/SetupWindow.cs
rename to SparkleShare/Linux/SetupWindow.cs
diff --git a/SparkleShare/Linux/UserInterface/StatusIcon.cs b/SparkleShare/Linux/StatusIcon.cs
similarity index 100%
rename from SparkleShare/Linux/UserInterface/StatusIcon.cs
rename to SparkleShare/Linux/StatusIcon.cs
diff --git a/SparkleShare/Linux/UserInterface/UserInterface.cs b/SparkleShare/Linux/UserInterface.cs
similarity index 100%
rename from SparkleShare/Linux/UserInterface/UserInterface.cs
rename to SparkleShare/Linux/UserInterface.cs
diff --git a/SparkleShare/Linux/UserInterface/UserInterfaceHelpers.cs b/SparkleShare/Linux/UserInterfaceHelpers.cs
similarity index 100%
rename from SparkleShare/Linux/UserInterface/UserInterfaceHelpers.cs
rename to SparkleShare/Linux/UserInterfaceHelpers.cs