diff --git a/extras-standard/CMakeLists.txt b/extras-standard/CMakeLists.txt
index 7b3fc79e..d2ce36f4 100644
--- a/extras-standard/CMakeLists.txt
+++ b/extras-standard/CMakeLists.txt
@@ -1,5 +1,9 @@
+add_subdirectory(apollo)
 add_subdirectory(cassini)
 add_subdirectory(galileo)
 add_subdirectory(hubble)
 add_subdirectory(iss)
 add_subdirectory(mir)
+add_subdirectory(shroxclassic)
+add_subdirectory(shroxmars)
+add_subdirectory(skylab)
diff --git a/extras-standard/apollo/CMakeLists.txt b/extras-standard/apollo/CMakeLists.txt
new file mode 100644
index 00000000..e1f6f4e0
--- /dev/null
+++ b/extras-standard/apollo/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(APOLLO_SOURCES
+  apollo.ssc
+  models/apollo.3ds
+)
+
+install_to_extras_subdir("${DATADIR}" apollo ${APOLLO_SOURCES})
diff --git a/extras/apollo.ssc b/extras-standard/apollo/apollo.ssc
similarity index 100%
rename from extras/apollo.ssc
rename to extras-standard/apollo/apollo.ssc
diff --git a/models/apollo.3ds b/extras-standard/apollo/models/apollo.3ds
similarity index 100%
rename from models/apollo.3ds
rename to extras-standard/apollo/models/apollo.3ds
diff --git a/extras-standard/shroxclassic/CMakeLists.txt b/extras-standard/shroxclassic/CMakeLists.txt
new file mode 100644
index 00000000..68ba8c66
--- /dev/null
+++ b/extras-standard/shroxclassic/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(CLASSIC_SOURCES
+  models/gemini.3ds
+  models/mercury7.3ds
+  shroxclassic.ssc
+)
+
+install_to_extras_subdir("${DATADIR}" shroxclassic ${CLASSIC_SOURCES})
diff --git a/models/gemini.3ds b/extras-standard/shroxclassic/models/gemini.3ds
similarity index 100%
rename from models/gemini.3ds
rename to extras-standard/shroxclassic/models/gemini.3ds
diff --git a/models/mercury7.3ds b/extras-standard/shroxclassic/models/mercury7.3ds
similarity index 100%
rename from models/mercury7.3ds
rename to extras-standard/shroxclassic/models/mercury7.3ds
diff --git a/extras/shroxclassic.ssc b/extras-standard/shroxclassic/shroxclassic.ssc
similarity index 100%
rename from extras/shroxclassic.ssc
rename to extras-standard/shroxclassic/shroxclassic.ssc
diff --git a/extras-standard/shroxmars/CMakeLists.txt b/extras-standard/shroxmars/CMakeLists.txt
new file mode 100644
index 00000000..e6b8aa73
--- /dev/null
+++ b/extras-standard/shroxmars/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(MARS_SOURCES
+  models/marsglobalsurvr.3ds
+  models/marsodyssey.3ds
+  shroxmars.ssc
+)
+
+install_to_extras_subdir("${DATADIR}" shroxmars ${MARS_SOURCES})
diff --git a/models/marsglobalsurvr.3ds b/extras-standard/shroxmars/models/marsglobalsurvr.3ds
similarity index 100%
rename from models/marsglobalsurvr.3ds
rename to extras-standard/shroxmars/models/marsglobalsurvr.3ds
diff --git a/models/marsodyssey.3ds b/extras-standard/shroxmars/models/marsodyssey.3ds
similarity index 100%
rename from models/marsodyssey.3ds
rename to extras-standard/shroxmars/models/marsodyssey.3ds
diff --git a/extras/shroxmars.ssc b/extras-standard/shroxmars/shroxmars.ssc
similarity index 100%
rename from extras/shroxmars.ssc
rename to extras-standard/shroxmars/shroxmars.ssc
diff --git a/extras-standard/skylab/CMakeLists.txt b/extras-standard/skylab/CMakeLists.txt
new file mode 100644
index 00000000..223d2e97
--- /dev/null
+++ b/extras-standard/skylab/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(SKYLAB_SOURCES
+  models/skylab.3ds
+  skylab.ssc
+)
+
+install_to_extras_subdir("${DATADIR}" skylab ${SKYLAB_SOURCES})
diff --git a/models/skylab.3ds b/extras-standard/skylab/models/skylab.3ds
similarity index 100%
rename from models/skylab.3ds
rename to extras-standard/skylab/models/skylab.3ds
diff --git a/extras/skylab.ssc b/extras-standard/skylab/skylab.ssc
similarity index 100%
rename from extras/skylab.ssc
rename to extras-standard/skylab/skylab.ssc
diff --git a/extras/CMakeLists.txt b/extras/CMakeLists.txt
index 41cc9316..e0cca5d5 100644
--- a/extras/CMakeLists.txt
+++ b/extras/CMakeLists.txt
@@ -1,8 +1,4 @@
 set(EXTRA_SOURCES
-  apollo.ssc
-  shroxclassic.ssc
-  shroxmars.ssc
-  skylab.ssc
 )
 
 install(FILES ${EXTRA_SOURCES} DESTINATION "${DATADIR}/extras")