diff --git a/ChangeLog b/ChangeLog
index 983f8249ed3e909d95d4e70fd3fad9b74c4d4016..845d4a0eeb3823b0bb614b4551a29ea27f78f3bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2015-06-09  Oliver Lemke  <olemke@core-dump.info>
+
+	* ARTS-XML-DATA-2-3-7
+
+	* Restructuring part 2
+
+	* planets/Earth/ERA40
+	  > moved to planets/Earth/ECMWF/ERA40
+
+	* atmosphere/garand
+          > moved to planets/Earth/Garand
+
+	* atmosphere/seeborV4
+          > moved to planets/Earth/SeeborV4
+
+	* climatology/msis90
+          > moved to planets/Earth/MSIS90/climatology
+
 2015-06-09  Oliver Lemke  <olemke@core-dump.info>
 
 	* ARTS-XML-DATA-2-3-6
diff --git a/planets/Earth/ERA40/LandSeaMask_ERA40_0.25Degree.xml.gz b/planets/Earth/ECMWF/ERA40/LandSeaMask_ERA40_0.25Degree.xml.gz
similarity index 100%
rename from planets/Earth/ERA40/LandSeaMask_ERA40_0.25Degree.xml.gz
rename to planets/Earth/ECMWF/ERA40/LandSeaMask_ERA40_0.25Degree.xml.gz
diff --git a/planets/Earth/ERA40/LandSeaMask_ERA40_1.0Degree.xml.gz b/planets/Earth/ECMWF/ERA40/LandSeaMask_ERA40_1.0Degree.xml.gz
similarity index 100%
rename from planets/Earth/ERA40/LandSeaMask_ERA40_1.0Degree.xml.gz
rename to planets/Earth/ECMWF/ERA40/LandSeaMask_ERA40_1.0Degree.xml.gz
diff --git a/planets/Earth/ERA40/SurfaceAltitude_ERA40_1.0Degree.xml.gz b/planets/Earth/ECMWF/ERA40/SurfaceAltitude_ERA40_1.0Degree.xml.gz
similarity index 100%
rename from planets/Earth/ERA40/SurfaceAltitude_ERA40_1.0Degree.xml.gz
rename to planets/Earth/ECMWF/ERA40/SurfaceAltitude_ERA40_1.0Degree.xml.gz
diff --git a/planets/Earth/ERA40/readme.txt b/planets/Earth/ECMWF/ERA40/readme.txt
similarity index 100%
rename from planets/Earth/ERA40/readme.txt
rename to planets/Earth/ECMWF/ERA40/readme.txt
diff --git a/atmosphere/garand/README b/planets/Earth/Garand/README
similarity index 100%
rename from atmosphere/garand/README
rename to planets/Earth/Garand/README
diff --git a/atmosphere/garand/garand_profiles.xml.gz b/planets/Earth/Garand/garand_profiles.xml.gz
similarity index 100%
rename from atmosphere/garand/garand_profiles.xml.gz
rename to planets/Earth/Garand/garand_profiles.xml.gz
diff --git a/climatology/msis90/README b/planets/Earth/MSIS90/climatology/README
similarity index 100%
rename from climatology/msis90/README
rename to planets/Earth/MSIS90/climatology/README
diff --git a/climatology/msis90/create_msis_xml.m b/planets/Earth/MSIS90/climatology/create_msis_xml.m
similarity index 100%
rename from climatology/msis90/create_msis_xml.m
rename to planets/Earth/MSIS90/climatology/create_msis_xml.m
diff --git a/climatology/msis90/msis.m b/planets/Earth/MSIS90/climatology/msis.m
similarity index 100%
rename from climatology/msis90/msis.m
rename to planets/Earth/MSIS90/climatology/msis.m
diff --git a/climatology/msis90/msis.zip b/planets/Earth/MSIS90/climatology/msis.zip
similarity index 100%
rename from climatology/msis90/msis.zip
rename to planets/Earth/MSIS90/climatology/msis.zip
diff --git a/climatology/msis90/msis90.t.xml b/planets/Earth/MSIS90/climatology/msis90.t.xml
similarity index 100%
rename from climatology/msis90/msis90.t.xml
rename to planets/Earth/MSIS90/climatology/msis90.t.xml
diff --git a/climatology/msis90/msis90.z.xml b/planets/Earth/MSIS90/climatology/msis90.z.xml
similarity index 100%
rename from climatology/msis90/msis90.z.xml
rename to planets/Earth/MSIS90/climatology/msis90.z.xml
diff --git a/climatology/msis90/msisdata.mat b/planets/Earth/MSIS90/climatology/msisdata.mat
similarity index 100%
rename from climatology/msis90/msisdata.mat
rename to planets/Earth/MSIS90/climatology/msisdata.mat
diff --git a/atmosphere/seeborV4/README b/planets/Earth/SeeborV4/README
similarity index 100%
rename from atmosphere/seeborV4/README
rename to planets/Earth/SeeborV4/README
diff --git a/atmosphere/seeborV4/seebor_emmi.xml.gz b/planets/Earth/SeeborV4/seebor_emmi.xml.gz
similarity index 100%
rename from atmosphere/seeborV4/seebor_emmi.xml.gz
rename to planets/Earth/SeeborV4/seebor_emmi.xml.gz
diff --git a/atmosphere/seeborV4/seebor_pro.xml.gz b/planets/Earth/SeeborV4/seebor_pro.xml.gz
similarity index 100%
rename from atmosphere/seeborV4/seebor_pro.xml.gz
rename to planets/Earth/SeeborV4/seebor_pro.xml.gz
diff --git a/atmosphere/seeborV4/seebor_stem.xml.gz b/planets/Earth/SeeborV4/seebor_stem.xml.gz
similarity index 100%
rename from atmosphere/seeborV4/seebor_stem.xml.gz
rename to planets/Earth/SeeborV4/seebor_stem.xml.gz
diff --git a/atmosphere/seeborV4/waveno.dat b/planets/Earth/SeeborV4/waveno.dat
similarity index 100%
rename from atmosphere/seeborV4/waveno.dat
rename to planets/Earth/SeeborV4/waveno.dat