diff --git a/Makefile.am b/Makefile.am
index 596e1ddaa2..b1ad24ca32 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ EXTRA_DIST = \
 splashdir = $(pkgdatadir)/splash
 splash_DATA = splash.png
 
-SUBDIRS = src data extras extras-standard textures models shaders fonts po po2 locale scripts
+SUBDIRS = src data textures models shaders fonts po po2 locale scripts catalogs
 
 # Non-automake directories
 NONAUTO = admin macosx windows
diff --git a/configure.in b/configure.in
index 6eba849286..bd6b40e552 100644
--- a/configure.in
+++ b/configure.in
@@ -424,23 +424,33 @@ AC_CONFIG_FILES([ src/celtxf/Makefile ])
 AC_CONFIG_FILES([ src/celengine/Makefile ])
 AC_CONFIG_FILES([ src/celephem/Makefile ])
 AC_CONFIG_FILES([ src/celestia/Makefile ])
+AC_CONFIG_FILES([ catalogs/Makefile ])
 AC_CONFIG_FILES([ data/Makefile ])
-AC_CONFIG_FILES([ extras/Makefile ])
-AC_CONFIG_FILES([ extras-standard/Makefile ])
-AC_CONFIG_FILES([ extras-standard/cassini/Makefile ])
-AC_CONFIG_FILES([ extras-standard/cassini/models/Makefile ])
-AC_CONFIG_FILES([ extras-standard/cassini/data/Makefile ])
-AC_CONFIG_FILES([ extras-standard/mir/Makefile ])
-AC_CONFIG_FILES([ extras-standard/mir/models/Makefile ])
-AC_CONFIG_FILES([ extras-standard/galileo/Makefile ])
-AC_CONFIG_FILES([ extras-standard/galileo/models/Makefile ])
-AC_CONFIG_FILES([ extras-standard/galileo/data/Makefile ])
-AC_CONFIG_FILES([ extras-standard/hubble/Makefile ])
-AC_CONFIG_FILES([ extras-standard/hubble/models/Makefile ])
-AC_CONFIG_FILES([ extras-standard/iss/Makefile ])
-AC_CONFIG_FILES([ extras-standard/iss/models/Makefile ])
-AC_CONFIG_FILES([ extras-standard/iss/textures/Makefile ])
-AC_CONFIG_FILES([ extras-standard/iss/textures/medres/Makefile ])
+AC_CONFIG_FILES([ data/locations/Makefile ])
+AC_CONFIG_FILES([ data/solar-system/Makefile ])
+AC_CONFIG_FILES([ data/solar-system/asteroids/Makefile ])
+AC_CONFIG_FILES([ data/solar-system/comets/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/interplanetary-missions/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/interplanetary-missions/cassini/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/interplanetary-missions/cassini/models/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/interplanetary-missions/cassini/data/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/near-earth-missions/mir/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/near-earth-missions/mir/models/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/jupiter-missions/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/jupiter-missions/galileo/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/jupiter-missions/galileo/models/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/jupiter-missions/galileo/data/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/mars-missions/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/moon-missions/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/space-observatories/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/space-observatories/hubble/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/space-observatories/hubble/models/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/near-earth-missions/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/near-earth-missions/iss/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/near-earth-missions/iss/models/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/near-earth-missions/iss/textures/Makefile ])
+AC_CONFIG_FILES([ data/spacecraft/near-earth-missions/iss/textures/medres/Makefile ])
 AC_CONFIG_FILES([ textures/Makefile ])
 AC_CONFIG_FILES([ textures/lores/Makefile ])
 AC_CONFIG_FILES([ textures/medres/Makefile ])
diff --git a/data/Makefile.am b/data/Makefile.am
index 113926eabe..99fe896b98 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1 @@
-SUBDIRS = locations solar-system spacecrafts
+SUBDIRS = locations solar-system spacecraft
diff --git a/src/celengine/image.cpp b/src/celengine/image.cpp
index 01ddf67e19..5f97892d02 100644
--- a/src/celengine/image.cpp
+++ b/src/celengine/image.cpp
@@ -65,6 +65,7 @@ extern "C" {
 #include <iostream>
 #include <algorithm>
 #include <cmath>
+#include <cstring>
 
 using namespace std;