diff --git a/.gitignore b/osx-server-gui/.gitignore
similarity index 100%
rename from .gitignore
rename to osx-server-gui/.gitignore
diff --git a/English.lproj/Credits.html b/osx-server-gui/English.lproj/Credits.html
similarity index 100%
rename from English.lproj/Credits.html
rename to osx-server-gui/English.lproj/Credits.html
diff --git a/English.lproj/InfoPlist.strings b/osx-server-gui/English.lproj/InfoPlist.strings
similarity index 100%
rename from English.lproj/InfoPlist.strings
rename to osx-server-gui/English.lproj/InfoPlist.strings
diff --git a/English.lproj/MainMenu.xib b/osx-server-gui/English.lproj/MainMenu.xib
similarity index 100%
rename from English.lproj/MainMenu.xib
rename to osx-server-gui/English.lproj/MainMenu.xib
diff --git a/Hop.icns b/osx-server-gui/Hop.icns
similarity index 100%
rename from Hop.icns
rename to osx-server-gui/Hop.icns
diff --git a/Makefile b/osx-server-gui/Makefile
similarity index 98%
rename from Makefile
rename to osx-server-gui/Makefile
index 6e9278b..c6b0e5d 100644
--- a/Makefile
+++ b/osx-server-gui/Makefile
@@ -1,4 +1,4 @@
-SERVER_PATH=../hop
+SERVER_PATH=../server
 SERVER_BINARY=hop_server.native
 SERVER_WEB=web
 APP_NAME="Hop Server"
diff --git a/fixup_shlibs.sh b/osx-server-gui/fixup_shlibs.sh
similarity index 100%
rename from fixup_shlibs.sh
rename to osx-server-gui/fixup_shlibs.sh
diff --git a/hopOsx-Info.plist b/osx-server-gui/hopOsx-Info.plist
similarity index 100%
rename from hopOsx-Info.plist
rename to osx-server-gui/hopOsx-Info.plist
diff --git a/hopOsx.xcodeproj/project.pbxproj b/osx-server-gui/hopOsx.xcodeproj/project.pbxproj
similarity index 100%
rename from hopOsx.xcodeproj/project.pbxproj
rename to osx-server-gui/hopOsx.xcodeproj/project.pbxproj
diff --git a/hopOsxAppDelegate.h b/osx-server-gui/hopOsxAppDelegate.h
similarity index 100%
rename from hopOsxAppDelegate.h
rename to osx-server-gui/hopOsxAppDelegate.h
diff --git a/hopOsxAppDelegate.m b/osx-server-gui/hopOsxAppDelegate.m
similarity index 100%
rename from hopOsxAppDelegate.m
rename to osx-server-gui/hopOsxAppDelegate.m
diff --git a/hopOsx_Prefix.pch b/osx-server-gui/hopOsx_Prefix.pch
similarity index 100%
rename from hopOsx_Prefix.pch
rename to osx-server-gui/hopOsx_Prefix.pch
diff --git a/icon/Makefile b/osx-server-gui/icon/Makefile
similarity index 100%
rename from icon/Makefile
rename to osx-server-gui/icon/Makefile
diff --git a/icon/icon.css b/osx-server-gui/icon/icon.css
similarity index 100%
rename from icon/icon.css
rename to osx-server-gui/icon/icon.css
diff --git a/icon/icon.html b/osx-server-gui/icon/icon.html
similarity index 100%
rename from icon/icon.html
rename to osx-server-gui/icon/icon.html
diff --git a/icon/icon.less b/osx-server-gui/icon/icon.less
similarity index 100%
rename from icon/icon.less
rename to osx-server-gui/icon/icon.less
diff --git a/main.m b/osx-server-gui/main.m
similarity index 100%
rename from main.m
rename to osx-server-gui/main.m