diff --git a/resonantgeoview_server/.gitignore b/server/.gitignore
similarity index 100%
rename from resonantgeoview_server/.gitignore
rename to server/.gitignore
diff --git a/resonantgeoview_server/geometa_OBJ_handler/__init__.py b/server/geometa_OBJ_handler/__init__.py
similarity index 100%
rename from resonantgeoview_server/geometa_OBJ_handler/__init__.py
rename to server/geometa_OBJ_handler/__init__.py
diff --git a/resonantgeoview_server/geometa_OBJ_handler/schema.py b/server/geometa_OBJ_handler/schema.py
similarity index 100%
rename from resonantgeoview_server/geometa_OBJ_handler/schema.py
rename to server/geometa_OBJ_handler/schema.py
diff --git a/resonantgeoview_server/plugin.cmake b/server/plugin.cmake
similarity index 100%
rename from resonantgeoview_server/plugin.cmake
rename to server/plugin.cmake
diff --git a/resonantgeoview_server/plugin.json b/server/plugin.json
similarity index 100%
rename from resonantgeoview_server/plugin.json
rename to server/plugin.json
diff --git a/resonantgeoview_server/server/__init__.py b/server/resonantgeoview_server/__init__.py
similarity index 100%
rename from resonantgeoview_server/server/__init__.py
rename to server/resonantgeoview_server/__init__.py
diff --git a/resonantgeoview_server/server/client_webroot.py b/server/resonantgeoview_server/client_webroot.py
similarity index 100%
rename from resonantgeoview_server/server/client_webroot.py
rename to server/resonantgeoview_server/client_webroot.py
diff --git a/resonantgeoview_server/server/models/__init__.py b/server/resonantgeoview_server/models/__init__.py
similarity index 100%
rename from resonantgeoview_server/server/models/__init__.py
rename to server/resonantgeoview_server/models/__init__.py
diff --git a/resonantgeoview_server/server/models/datasetGroup.py b/server/resonantgeoview_server/models/datasetGroup.py
similarity index 100%
rename from resonantgeoview_server/server/models/datasetGroup.py
rename to server/resonantgeoview_server/models/datasetGroup.py
diff --git a/resonantgeoview_server/server/rest/__init__.py b/server/resonantgeoview_server/rest/__init__.py
similarity index 100%
rename from resonantgeoview_server/server/rest/__init__.py
rename to server/resonantgeoview_server/rest/__init__.py
diff --git a/resonantgeoview_server/server/rest/dataset.py b/server/resonantgeoview_server/rest/dataset.py
similarity index 100%
rename from resonantgeoview_server/server/rest/dataset.py
rename to server/resonantgeoview_server/rest/dataset.py
diff --git a/resonantgeoview_server/server/rest/datasetGroup.py b/server/resonantgeoview_server/rest/datasetGroup.py
similarity index 100%
rename from resonantgeoview_server/server/rest/datasetGroup.py
rename to server/resonantgeoview_server/rest/datasetGroup.py
diff --git a/resonantgeoview_server/server/rest/gaia/__init__.py b/server/resonantgeoview_server/rest/gaia/__init__.py
similarity index 100%
rename from resonantgeoview_server/server/rest/gaia/__init__.py
rename to server/resonantgeoview_server/rest/gaia/__init__.py
diff --git a/resonantgeoview_server/server/rest/gaia/processing.py b/server/resonantgeoview_server/rest/gaia/processing.py
similarity index 100%
rename from resonantgeoview_server/server/rest/gaia/processing.py
rename to server/resonantgeoview_server/rest/gaia/processing.py
diff --git a/resonantgeoview_server/server/util/__init__.py b/server/resonantgeoview_server/util/__init__.py
similarity index 100%
rename from resonantgeoview_server/server/util/__init__.py
rename to server/resonantgeoview_server/util/__init__.py
diff --git a/resonantgeoview_server/server/util/utility.py b/server/resonantgeoview_server/util/utility.py
similarity index 100%
rename from resonantgeoview_server/server/util/utility.py
rename to server/resonantgeoview_server/util/utility.py
diff --git a/resonantgeoview_server/setup.py b/server/setup.py
similarity index 94%
rename from resonantgeoview_server/setup.py
rename to server/setup.py
index 7f13e1c..1349c28 100644
--- a/resonantgeoview_server/setup.py
+++ b/server/setup.py
@@ -33,7 +33,7 @@
     ],
     entry_points={
         'girder.plugin': [
-            'server = server:GirderPlugin'
+            'resonantgeoview_server = resonantgeoview_server:GirderPlugin'
         ],
         'girder_worker_plugins': [
             'gaia_task = gaia_task:GaiaTasks',