diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bfa7d59
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,21 @@
+map/*
+CMakeFiles/*
+src/CMakeFiles/*
+src/Makefile
+src/cmake_config.h
+src/cmake_install.cmake
+src/jthread/CMakeFiles/*
+src/jthread/Makefile
+src/jthread/cmake_config.h
+src/jthread/cmake_install.cmake
+minetest.conf
+bin/
+CMakeCache.txt
+CPackConfig.cmake
+CPackSourceConfig.cmake
+Makefile
+cmake_install.cmake
+src/jthread/libjthread.a
+debug.txt
+bin/debug.txt
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70d20de..5167789 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,7 @@ elseif(UNIX) # Linux, BSD etc
 	set(EXAMPLE_CONF_DIR "share/doc/minetest")
 endif()
 
-install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
+install(FILES "README.txt" DESTINATION "${DOCDIR}")
 install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
 
 #
diff --git a/doc/README.txt b/README.txt
similarity index 97%
rename from doc/README.txt
rename to README.txt
index 645e2a5..4104899 100644
--- a/doc/README.txt
+++ b/README.txt
@@ -2,18 +2,19 @@ Minetest-c55
 ---------------
 An InfiniMiner/Minecraft inspired game.
 Copyright (c) 2010-2011 Perttu Ahola <celeron55@gmail.com>
+(see source files for other contributors)
 
 Further documentation:
 ----------------------
 - Website: http://celeron.55.lt/~celeron55/minetest/
 - Wiki: http://celeron.55.lt/~celeron55/minetest/wiki/
 - Forum: http://celeron.55.lt/~celeron55/minetest/forum/
+- doc/ directory of source distribution
 
-This is a development version:
-------------------------------
+This game is not finished:
+--------------------------
 - Don't expect it to work as well as a finished game will.
-- Please report any bugs to me. That way I can fix them to the next release.
-	- debug.txt is useful when the game crashes.
+- Please report any bugs to me. debug.txt is useful.
 
 Controls:
 ---------
diff --git a/addlicensecomments.sh b/addlicensecomments.sh
deleted file mode 100644
index e5642e8..0000000
--- a/addlicensecomments.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-for i in `grep -L 'This program is free software' src/*.{h,cpp}`
-do
-	cat licensecomment.txt > tempfile
-	cat $i >> tempfile
-	cp tempfile $i
-done
-rm tempfile
-
diff --git a/makepackage_binary.sh b/makepackage_binary.sh
deleted file mode 100755
index f00ec60..0000000
--- a/makepackage_binary.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-PACKAGEDIR=../minetest-packages
-PACKAGENAME=minetest-c55-binary-`date +%y%m%d%H%M%S`
-PACKAGEPATH=$PACKAGEDIR/$PACKAGENAME
-
-mkdir -p $PACKAGEPATH
-mkdir -p $PACKAGEPATH/bin
-mkdir -p $PACKAGEPATH/data
-mkdir -p $PACKAGEPATH/doc
-
-cp minetest.conf.example $PACKAGEPATH/
-
-cp bin/minetest.exe $PACKAGEPATH/bin/
-cp bin/Irrlicht.dll $PACKAGEPATH/bin/
-cp bin/zlibwapi.dll $PACKAGEPATH/bin/
-#cp bin/test $PACKAGEPATH/bin/
-#cp bin/fasttest $PACKAGEPATH/bin/
-#cp bin/server $PACKAGEPATH/bin/
-#cp ../irrlicht/irrlicht-1.7.1/lib/Linux/libIrrlicht.a $PACKAGEPATH/bin/
-#cp ../jthread/jthread-1.2.1/src/.libs/libjthread-1.2.1.so $PACKAGEPATH/bin/
-
-cp -r data/fontlucida.png $PACKAGEPATH/data/
-cp -r data/player.png $PACKAGEPATH/data/
-cp -r data/player_back.png $PACKAGEPATH/data/
-cp -r data/stone.png $PACKAGEPATH/data/
-cp -r data/grass.png $PACKAGEPATH/data/
-cp -r data/grass_footsteps.png $PACKAGEPATH/data/
-cp -r data/water.png $PACKAGEPATH/data/
-cp -r data/tree.png $PACKAGEPATH/data/
-cp -r data/leaves.png $PACKAGEPATH/data/
-cp -r data/mese.png $PACKAGEPATH/data/
-cp -r data/cloud.png $PACKAGEPATH/data/
-cp -r data/sign.png $PACKAGEPATH/data/
-cp -r data/sign_back.png $PACKAGEPATH/data/
-cp -r data/rat.png $PACKAGEPATH/data/
-cp -r data/mud.png $PACKAGEPATH/data/
-cp -r data/torch.png $PACKAGEPATH/data/
-cp -r data/torch_on_floor.png $PACKAGEPATH/data/
-cp -r data/torch_on_ceiling.png $PACKAGEPATH/data/
-cp -r data/tree_top.png $PACKAGEPATH/data/
-cp -r data/coalstone.png $PACKAGEPATH/data/
-cp -r data/crack.png $PACKAGEPATH/data/
-cp -r data/wood.png $PACKAGEPATH/data/
-cp -r data/stick.png $PACKAGEPATH/data/
-cp -r data/tool_wpick.png $PACKAGEPATH/data/
-cp -r data/tool_stpick.png $PACKAGEPATH/data/
-cp -r data/tool_mesepick.png $PACKAGEPATH/data/
-cp -r data/grass_side.png $PACKAGEPATH/data/
-cp -r data/lump_of_coal.png $PACKAGEPATH/data/
-cp -r data/lump_of_iron.png $PACKAGEPATH/data/
-cp -r data/mineral_coal.png $PACKAGEPATH/data/
-cp -r data/mineral_iron.png $PACKAGEPATH/data/
-cp -r data/sand.png $PACKAGEPATH/data/
-
-#cp -r data/pauseMenu.gui $PACKAGEPATH/data/
-
-cp -r doc/README.txt $PACKAGEPATH/doc/README.txt
-
-cd $PACKAGEDIR
-rm $PACKAGENAME.zip
-zip -r $PACKAGENAME.zip $PACKAGENAME
-
diff --git a/Makefile.bak b/old/Makefile.bak
similarity index 100%
rename from Makefile.bak
rename to old/Makefile.bak
diff --git a/minetest.sln b/old/minetest.sln
similarity index 100%
rename from minetest.sln
rename to old/minetest.sln
diff --git a/minetest.vcproj b/old/minetest.vcproj
similarity index 100%
rename from minetest.vcproj
rename to old/minetest.vcproj
diff --git a/genmap.py b/util/genmap.py
similarity index 99%
rename from genmap.py
rename to util/genmap.py
index a605094..6b36269 100755
--- a/genmap.py
+++ b/util/genmap.py
@@ -41,7 +41,7 @@ SEED = 0
 # 0=old, 1=new
 SECTOR_DIR_FORMAT = 1
 
-mapdir = "world"
+mapdir = "../world"
 
 def to4h(i):
 	s = "";
diff --git a/pnoise.py b/util/pnoise.py
similarity index 100%
rename from pnoise.py
rename to util/pnoise.py