diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e8993e1..492b71d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,8 @@
 
 cmake_minimum_required(VERSION 3.8)
 
-project(celestia VERSION "1.7.0" LANGUAGES NONE)
+# set languages to C to stop GNUInstallDirs from complaining
+project(celestia VERSION "1.7.0" LANGUAGES C)
 
 option(ENABLE_NLS     "Enable object names translation? (Default: on)" ON)
 
@@ -38,6 +39,7 @@ add_subdirectory(data)
 add_subdirectory(extras)
 add_subdirectory(extras-standard)
 add_subdirectory(models)
+add_subdirectory(models-extra)
 add_subdirectory(po)
 add_subdirectory(textures)
 add_subdirectory(warp)
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index c2767678..cf2cdabc 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -13,6 +13,7 @@ set(DATA_SOURCES
   saoxindex.dat
   starnames.dat
   stars.dat
+  stars.dat.license
   extrasolar.ssc
   solarsys.ssc
   charm2.stc
diff --git a/models-extra/CMakeLists.txt b/models-extra/CMakeLists.txt
new file mode 100644
index 00000000..f036c70a
--- /dev/null
+++ b/models-extra/CMakeLists.txt
@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: Celestia Development Team
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+file(GLOB MODELS_EXTRA_SOURCES "*.3ds" "*.cmod" "*.cms" "*.png" "*.license")
+install(FILES ${MODELS_EXTRA_SOURCES} DESTINATION "${DATADIR}/models" COMPONENT models-extras EXCLUDE_FROM_ALL)
diff --git a/models/amalthea.3ds b/models-extra/amalthea.3ds
similarity index 100%
rename from models/amalthea.3ds
rename to models-extra/amalthea.3ds
diff --git a/models/bacchus.3ds b/models-extra/bacchus.3ds
similarity index 100%
rename from models/bacchus.3ds
rename to models-extra/bacchus.3ds
diff --git a/models/castalia.3ds b/models-extra/castalia.3ds
similarity index 100%
rename from models/castalia.3ds
rename to models-extra/castalia.3ds
diff --git a/models/deimos.3ds b/models-extra/deimos.3ds
similarity index 100%
rename from models/deimos.3ds
rename to models-extra/deimos.3ds
diff --git a/models/epimetheus.3ds b/models-extra/epimetheus.3ds
similarity index 100%
rename from models/epimetheus.3ds
rename to models-extra/epimetheus.3ds
diff --git a/models/eros.3ds b/models-extra/eros.3ds
similarity index 100%
rename from models/eros.3ds
rename to models-extra/eros.3ds
diff --git a/models/gaspra.3ds b/models-extra/gaspra.3ds
similarity index 100%
rename from models/gaspra.3ds
rename to models-extra/gaspra.3ds
diff --git a/models/geographos.3ds b/models-extra/geographos.3ds
similarity index 100%
rename from models/geographos.3ds
rename to models-extra/geographos.3ds
diff --git a/models/golevka.3ds b/models-extra/golevka.3ds
similarity index 100%
rename from models/golevka.3ds
rename to models-extra/golevka.3ds
diff --git a/models/halley.3ds b/models-extra/halley.3ds
similarity index 100%
rename from models/halley.3ds
rename to models-extra/halley.3ds
diff --git a/models/hyperion.3ds b/models-extra/hyperion.3ds
similarity index 100%
rename from models/hyperion.3ds
rename to models-extra/hyperion.3ds
diff --git a/models/ida.3ds b/models-extra/ida.3ds
similarity index 100%
rename from models/ida.3ds
rename to models-extra/ida.3ds
diff --git a/models/janus.3ds b/models-extra/janus.3ds
similarity index 100%
rename from models/janus.3ds
rename to models-extra/janus.3ds
diff --git a/models/kleopatra.3ds b/models-extra/kleopatra.3ds
similarity index 100%
rename from models/kleopatra.3ds
rename to models-extra/kleopatra.3ds
diff --git a/models/ky26.3ds b/models-extra/ky26.3ds
similarity index 100%
rename from models/ky26.3ds
rename to models-extra/ky26.3ds
diff --git a/models/larissa.3ds b/models-extra/larissa.3ds
similarity index 100%
rename from models/larissa.3ds
rename to models-extra/larissa.3ds
diff --git a/models/pandora.3ds b/models-extra/pandora.3ds
similarity index 100%
rename from models/pandora.3ds
rename to models-extra/pandora.3ds
diff --git a/models/phobos.3ds b/models-extra/phobos.3ds
similarity index 100%
rename from models/phobos.3ds
rename to models-extra/phobos.3ds
diff --git a/models/phoebe.3ds b/models-extra/phoebe.3ds
similarity index 100%
rename from models/phoebe.3ds
rename to models-extra/phoebe.3ds
diff --git a/models/prometheus.3ds b/models-extra/prometheus.3ds
similarity index 100%
rename from models/prometheus.3ds
rename to models-extra/prometheus.3ds
diff --git a/models/proteus.3ds b/models-extra/proteus.3ds
similarity index 100%
rename from models/proteus.3ds
rename to models-extra/proteus.3ds
diff --git a/models/toutatis.3ds b/models-extra/toutatis.3ds
similarity index 100%
rename from models/toutatis.3ds
rename to models-extra/toutatis.3ds
diff --git a/models/vesta.3ds b/models-extra/vesta.3ds
similarity index 100%
rename from models/vesta.3ds
rename to models-extra/vesta.3ds
diff --git a/models/CMakeLists.txt b/models/CMakeLists.txt
index 44c044a8..a402a8e5 100644
--- a/models/CMakeLists.txt
+++ b/models/CMakeLists.txt
@@ -1,81 +1,5 @@
 # SPDX-FileCopyrightText: Celestia Development Team
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-set(MODELS_SOURCES
-  amalthea.cmod
-  arrokoth.cmod
-  asteroid.cms
-  atlas.cmod
-  bacchus.cmod
-  borrelly.cms
-  calypso.cmod
-  castalia.cmod
-  daphnis.cmod
-  deimos.cmod
-  E0.png
-  epimetheus.cmod
-  eros.cmod
-  gaspra.cmod
-  geographos.cmod
-  golevka.cmod
-  halley.cmod
-  helene.cmod
-  hydra.cmod
-  hyperion.cmod
-  ida.cmod
-  itokawa.cmod
-  janus.cmod
-  kleopatra.cmod
-  ky26.cmod
-  larissa.cmod
-  MilkyWay.png
-  mimas.cmod
-  pan.cmod
-  pandora.cmod
-  phobos.cmod
-  phoebe.cmod
-  prometheus.cmod
-  proteus.cmod
-  puck.cmod
-  roughsphere.cms
-  S0.png
-  Sa.png
-  Sb.png
-  SBa.png
-  SBb.png
-  SBc.png
-  Sc.png
-  telesto.cmod
-  thebe.cmod
-  toutatis.cmod
-  vesta.cmod
-)
-
-set(MODELS_EXTRA_SOURCES
-  amalthea.3ds
-  bacchus.3ds
-  castalia.3ds
-  deimos.3ds
-  epimetheus.3ds
-  eros.3ds
-  gaspra.3ds
-  geographos.3ds
-  golevka.3ds
-  halley.3ds
-  hyperion.3ds
-  ida.3ds
-  janus.3ds
-  kleopatra.3ds
-  ky26.3ds
-  larissa.3ds
-  pandora.3ds
-  phobos.3ds
-  phoebe.3ds
-  prometheus.3ds
-  proteus.3ds
-  toutatis.3ds
-  vesta.3ds
-)
-
+file(GLOB MODELS_SOURCES "*.3ds" "*.cmod" "*.cms" "*.png" "*.license")
 install(FILES ${MODELS_SOURCES} DESTINATION "${DATADIR}/models" COMPONENT core)
-install(FILES ${MODELS_EXTRA_SOURCES} DESTINATION "${DATADIR}/models" COMPONENT models-extras EXCLUDE_FROM_ALL)
diff --git a/textures/CMakeLists.txt b/textures/CMakeLists.txt
index 9ac3db91..7cfdb447 100644
--- a/textures/CMakeLists.txt
+++ b/textures/CMakeLists.txt
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Celestia Development Team
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-file(GLOB TEXTURES_SOURCES "*.jpg" "*.png")
+file(GLOB TEXTURES_SOURCES "*.jpg" "*.png" "*.license")
 
 install(FILES ${TEXTURES_SOURCES} DESTINATION "${DATADIR}/textures" COMPONENT core)
 
diff --git a/textures/hires/CMakeLists.txt b/textures/hires/CMakeLists.txt
index ef1cc598..78fc384d 100644
--- a/textures/hires/CMakeLists.txt
+++ b/textures/hires/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: Celestia Development Team
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-file(GLOB HIRES_SOURCES "*.jpg" "*.png" "*.dds")
+file(GLOB HIRES_SOURCES "*.jpg" "*.png" "*.dds" "*.license")
 
 install(FILES ${HIRES_SOURCES} DESTINATION "${DATADIR}/textures/hires" COMPONENT core)
diff --git a/textures/lores/CMakeLists.txt b/textures/lores/CMakeLists.txt
index 6f0638ee..e982b760 100644
--- a/textures/lores/CMakeLists.txt
+++ b/textures/lores/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: Celestia Development Team
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-file(GLOB LORES_SOURCES "*.jpg" "*.png" "*.dds")
+file(GLOB LORES_SOURCES "*.jpg" "*.png" "*.dds" "*.license")
 
 install(FILES ${LORES_SOURCES} DESTINATION "${DATADIR}/textures/lores" COMPONENT core)
diff --git a/textures/medres/CMakeLists.txt b/textures/medres/CMakeLists.txt
index 4cb2f710..8e04f033 100644
--- a/textures/medres/CMakeLists.txt
+++ b/textures/medres/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: Celestia Development Team
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-file(GLOB MEDRES_SOURCES "*.jpg" "*.png" "*.dds")
+file(GLOB MEDRES_SOURCES "*.jpg" "*.png" "*.dds" "*.license")
 
 install(FILES ${MEDRES_SOURCES} DESTINATION "${DATADIR}/textures/medres" COMPONENT core)