diff --git a/conkyrcExample b/conkyExample/conkyrcExample
similarity index 100%
rename from conkyrcExample
rename to conkyExample/conkyrcExample
diff --git a/conkyrcExample2 b/conkyExample/conkyrcExample2
similarity index 100%
rename from conkyrcExample2
rename to conkyExample/conkyrcExample2
diff --git a/conkyrcOld b/conkyExample/conkyrcOld
similarity index 100%
rename from conkyrcOld
rename to conkyExample/conkyrcOld
diff --git a/debian-multimedia-keyring_2008.10.16_all.deb b/debian/debian-multimedia-keyring_2008.10.16_all.deb
similarity index 100%
rename from debian-multimedia-keyring_2008.10.16_all.deb
rename to debian/debian-multimedia-keyring_2008.10.16_all.deb
diff --git a/sources.list b/debian/sources.list
similarity index 100%
rename from sources.list
rename to debian/sources.list
diff --git a/Desktop b/doc/Desktop
similarity index 93%
rename from Desktop
rename to doc/Desktop
index ca96d72..07cbb7a 100644
--- a/Desktop
+++ b/doc/Desktop
@@ -35,7 +35,7 @@ sudo aptitude install network-manager-gnome
 sudo aptitude install xplanet
 
 
-sudo dpkg -i $NOWHERE/debian-multimedia-keyring_2008.10.16_all.deb
+sudo dpkg -i $NOWHERE/debian/debian-multimedia-keyring_2008.10.16_all.deb
 wget -q http://download.virtualbox.org/virtualbox/debian/sun_vbox.asc -O- | sudo apt-key add -
 
 sudo update-alternatives --config java
diff --git a/HOSTO_CTAGS b/doc/HOSTO_CTAGS
similarity index 100%
rename from HOSTO_CTAGS
rename to doc/HOSTO_CTAGS
diff --git a/HOWTO_CSCOPEDB b/doc/HOWTO_CSCOPEDB
similarity index 100%
rename from HOWTO_CSCOPEDB
rename to doc/HOWTO_CSCOPEDB
diff --git a/vim b/doc/vim
similarity index 100%
rename from vim
rename to doc/vim
diff --git a/sun_vbox.asc b/sun_vbox.asc
deleted file mode 100644
index 410a614..0000000
--- a/sun_vbox.asc
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBEh7C8oRBACtOAieuw71PWaeBpi3djCX2sbZ3pqvfMsTaUb4E8Jo6ylC5xOa
-rc4PUQt5/fHaFwOgP+MF11pt8LunY7nXgFNufmXWxAwjaB26EqAF9CytxJS7viu9
-tjEFqWQIL+2GHE1sEAevr8EvVr7fnmCUuY06nb1WvaOlL1VO2DAs+aJ2fwCguhlZ
-ozqrrFyhO7XjRX9imHXbIvsD/2ntslEsaYgnTaNAOCGVUZi4kUQKVZrELgYpLo0Z
-Wq6fbAskgI5qFe4XgP0TqLoI4KLg5OaMXdWDhboaJ3Ln9JgQnjLS3fJG75Lu3QF/
-6nPWYKcuQILLOcsXPthHDxyvRqTv5uUmiNRSDJSMLMA2LgUjzKJ7mEzDZ/uL8jZq
-jfR2A/9r+H4wct/YS0Xmm2JWZxDlT+D27zF0zKzHVINr2eSK8K5mIhOZxAJN37ay
-qVcegz23JII3MQKOuvuH7pBzGEY1IiT6gvAI7WjVm+pRU+TarVwytoANWOvTWfid
-2Y/OgClJ4iqnhj/egM/c3A7KrGG4Q/Tj1rHqnB+rRilVoYQbaLRRU3VuIE1pY3Jv
-c3lzdGVtcywgSW5jLiAoeFZNIFZpcnR1YWxCb3ggYXJjaGl2ZSBzaWduaW5nIGtl
-eSkgPGluZm9AdmlydHVhbGJveC5vcmc+iGAEExECACAFAkh7C8oCGwMGCwkIBwMC
-BBUCCAMEFgIDAQIeAQIXgAAKCRDc+fh7bfvLrnOHAJwLYTeiZC3HyO6758GKiMHZ
-2VTO5gCfXb1PdW17wqGKz5nyka9qpjOAs2C5Ag0ESHsL0BAIAKVaUE5yk8vsXkbj
-CPxrs2R7XuqrLp2/KSdjV7wi1dhwOgFUNObNMsK3K683mxmMnT65mJ/HqiXgW9WY
-5PgLzrHnEA27O7v2ol3O86wkr5BHaaStsLpkDIMItywjPqZkp7KHFDRXrhGTiHLg
-0D6YQB/+GRlxWZTAmB6F+ZGwQj3k9+q7kUd5Gj+LbmC6RA/7yrxgLgCRpdbilGQd
-xV2mGanX2qoA0Fu1nVXDWw3lPU95za3iAXVle89YRNFRK2WxV0hIFhqA/DndR1Y8
-M9fL4jDYXRtbDnUTkhfZiH9MiuDVSzcXN0cUApaovLlnvDaPB7iLTi8SmIMdO6YY
-ME7JwCsAAwUIAISgj2zdQC4TilbTGifMMJ0m3dVbjaoApuTaQc+vulCIhr/rf1DN
-V7gtLNd+CRx67xtyVKfxPWL5vBL9OBCWcCdYY2iCplXv8gUZmwRtTN/B0+Ce07Re
-+bWUe/wBl7z6YBYQnmtOxK55OXEgzv3/wL7L8Mt3co8AeO1qy4kM66JFnq8Scw81
-Axx4lcIPW1q17moygSwD/1YbEgFMQHs/8V8aqB9xIs5yOdsA4VWj32V7ymW2V+sx
-4oKoiZiYuGZOjgGpZlQMxgUaORO0PPRSqnCmuV9zujmd28Fljdrb+WDvc/xDwiKg
-nN/FKpMczPur8keOGpPSeUmZPaxkNmKbqGyISQQYEQIACQUCSHsL0AIbDAAKCRDc
-+fh7bfvLronZAKCfiCvC2s61vA1x/YJ9QUPn4lCpjgCbB4dSVAHE/imWR02yFhqz
-32NqKPU=
-=FQ5T
------END PGP PUBLIC KEY BLOCK-----
diff --git a/clouds.pl b/xplanet/clouds.pl
similarity index 100%
rename from clouds.pl
rename to xplanet/clouds.pl
diff --git a/default b/xplanet/default
similarity index 100%
rename from default
rename to xplanet/default
diff --git a/xplanet-bg b/xplanet/xplanet-bg
similarity index 100%
rename from xplanet-bg
rename to xplanet/xplanet-bg
diff --git a/xplanet.conf b/xplanet/xplanet.conf
similarity index 100%
rename from xplanet.conf
rename to xplanet/xplanet.conf