diff --git a/modules/exoplanets/CMakeLists.txt b/modules/exoplanets/CMakeLists.txt
index 1168030ed1..85d59b86a9 100644
--- a/modules/exoplanets/CMakeLists.txt
+++ b/modules/exoplanets/CMakeLists.txt
@@ -27,7 +27,6 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 set(HEADER_FILES
     exoplanetshelper.h
     exoplanetsmodule.h
-    rendering/renderablehabitablezone.h
     rendering/renderableorbitdisc.h
     tasks/exoplanetsdatapreparationtask.h
 )
@@ -37,7 +36,6 @@ set(SOURCE_FILES
     exoplanetshelper.cpp
     exoplanetsmodule.cpp
     exoplanetsmodule_lua.inl
-    rendering/renderablehabitablezone.cpp
     rendering/renderableorbitdisc.cpp
     tasks/exoplanetsdatapreparationtask.cpp
 )
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index 1fc47e97ec..d923266e51 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -24,7 +24,6 @@
 
 #include <modules/exoplanets/exoplanetsmodule.h>
 
-#include <modules/exoplanets/rendering/renderablehabitablezone.h>
 #include <modules/exoplanets/rendering/renderableorbitdisc.h>
 #include <modules/exoplanets/tasks/exoplanetsdatapreparationtask.h>
 #include <openspace/engine/globals.h>
@@ -90,14 +89,12 @@ void ExoplanetsModule::internalInitialize(const ghoul::Dictionary&) {
     ghoul_assert(fTask, "No task factory existed");
     fTask->registerClass<ExoplanetsDataPreparationTask>("ExoplanetsDataPreparationTask");
     fRenderable->registerClass<RenderableOrbitDisc>("RenderableOrbitDisc");
-    fRenderable->registerClass<RenderableHabitableZone>("RenderableHabitableZone");
 }
 
 std::vector<documentation::Documentation> ExoplanetsModule::documentations() const {
     return {
         ExoplanetsDataPreparationTask::documentation(),
         RenderableOrbitDisc::Documentation(),
-        RenderableHabitableZone::Documentation()
     };
 }
 
diff --git a/modules/exoplanets/include.cmake b/modules/exoplanets/include.cmake
index ffea0ac430..c186634837 100644
--- a/modules/exoplanets/include.cmake
+++ b/modules/exoplanets/include.cmake
@@ -1 +1,4 @@
 set(DEFAULT_MODULE ON)
+set (OPENSPACE_DEPENDENCIES
+  space
+)
diff --git a/modules/space/CMakeLists.txt b/modules/space/CMakeLists.txt
index 2c1a4e5e48..8d7222bddc 100644
--- a/modules/space/CMakeLists.txt
+++ b/modules/space/CMakeLists.txt
@@ -27,6 +27,7 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 set(HEADER_FILES
   rendering/planetgeometry.h
   rendering/renderableconstellationbounds.h
+  rendering/renderablehabitablezone.h
   rendering/renderablerings.h
   rendering/renderableorbitalkepler.h
   rendering/renderablesatellites.h
@@ -44,6 +45,7 @@ source_group("Header Files" FILES ${HEADER_FILES})
 set(SOURCE_FILES
   rendering/planetgeometry.cpp
   rendering/renderableconstellationbounds.cpp
+  rendering/renderablehabitablezone.cpp
   rendering/renderablerings.cpp
   rendering/renderableorbitalkepler.cpp
   rendering/renderablesatellites.cpp
diff --git a/modules/space/include.cmake b/modules/space/include.cmake
index ffea0ac430..f5adeba225 100644
--- a/modules/space/include.cmake
+++ b/modules/space/include.cmake
@@ -1 +1,4 @@
 set(DEFAULT_MODULE ON)
+set (OPENSPACE_DEPENDENCIES
+  base
+)
diff --git a/modules/exoplanets/rendering/renderablehabitablezone.cpp b/modules/space/rendering/renderablehabitablezone.cpp
similarity index 97%
rename from modules/exoplanets/rendering/renderablehabitablezone.cpp
rename to modules/space/rendering/renderablehabitablezone.cpp
index 3d090b6975..927b2676a4 100644
--- a/modules/exoplanets/rendering/renderablehabitablezone.cpp
+++ b/modules/space/rendering/renderablehabitablezone.cpp
@@ -22,7 +22,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <modules/exoplanets/rendering/renderablehabitablezone.h>
+#include <modules/space/rendering/renderablehabitablezone.h>
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
@@ -63,11 +63,6 @@ documentation::Documentation RenderableHabitableZone::Documentation() {
         "Renderable Habitable Zone",
         "exoplanets_renderable_habitable_zone",
         {
-            {
-                "Type",
-                new StringEqualVerifier("RenderableHabitableZone"),
-                Optional::No
-            },
             {
                 EffectiveTemperatureInfo.identifier,
                 new DoubleVerifier,
diff --git a/modules/exoplanets/rendering/renderablehabitablezone.h b/modules/space/rendering/renderablehabitablezone.h
similarity index 100%
rename from modules/exoplanets/rendering/renderablehabitablezone.h
rename to modules/space/rendering/renderablehabitablezone.h
diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp
index cdc90d3768..95c576e14f 100644
--- a/modules/space/spacemodule.cpp
+++ b/modules/space/spacemodule.cpp
@@ -24,8 +24,8 @@
 
 #include <modules/space/spacemodule.h>
 
-#include <modules/space/rendering/renderablesatellites.h>
 #include <modules/space/rendering/renderableconstellationbounds.h>
+#include <modules/space/rendering/renderablehabitablezone.h>
 #include <modules/space/rendering/renderablerings.h>
 #include <modules/space/rendering/renderablesatellites.h>
 #include <modules/space/rendering/renderablesmallbody.h>
@@ -80,7 +80,7 @@ void SpaceModule::internalInitialize(const ghoul::Dictionary& dictionary) {
     fRenderable->registerClass<RenderableConstellationBounds>(
         "RenderableConstellationBounds"
     );
-
+    fRenderable->registerClass<RenderableHabitableZone>("RenderableHabitableZone");
     fRenderable->registerClass<RenderableRings>("RenderableRings");
     fRenderable->registerClass<RenderableSatellites>("RenderableSatellites");
     fRenderable->registerClass<RenderableSmallBody>("RenderableSmallBody");
@@ -119,6 +119,7 @@ void SpaceModule::internalDeinitializeGL() {
 std::vector<documentation::Documentation> SpaceModule::documentations() const {
     return {
         RenderableConstellationBounds::Documentation(),
+        RenderableHabitableZone::Documentation(),
         RenderableRings::Documentation(),
         RenderableSatellites::Documentation(),
         RenderableSmallBody::Documentation(),