diff --git a/Makefile.am b/Makefile.am
index 14206b7c1..a9a8fe869 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = @BULLETTREE@ src wavs images models oggs data fonts
+SUBDIRS = @BULLETTREE@ src wavs images models oggs doc data fonts
 
 EXTRA_DIST = README ChangeLog COPYING missing
 
diff --git a/configure.ac b/configure.ac
index f804a9a83..689f047db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -383,11 +383,6 @@ dnl Bullet physics
 dnl ==============
 AC_DEFINE([BT_NO_PROFILE], [], [Disable bullet internal profiling])
 CXXFLAGS="$CXXFLAGS -Ibullet/src"
-AC_CONFIG_FILES([         \
-		 src/bullet/Makefile      \
-		 src/bullet/src/Makefile  \
-		 src/bullet/Demos/OpenGL/Makefile
-])
 SUMMARY="$SUMMARY\nUsing bullet physics."
 BULLETTREE="src/bullet"
 
@@ -405,17 +400,23 @@ AC_SUBST(BULLETTREE)
 dnl ================
 dnl Create makefiles
 dnl ================
-AC_CONFIG_FILES([         \
- Makefile                 \
- data/Makefile            \
- fonts/Makefile           \
- images/Makefile          \
- models/Makefile          \
- oggs/Makefile		  \
- src/Makefile             \
- wavs/Makefile            \
- wavs/radio/Makefile      \
- wavs/tintagel/Makefile   \
+AC_CONFIG_FILES([                 \
+ Makefile                         \
+ data/Makefile                    \
+ doc/Makefile                     \
+ doc/players_manual/Makefile      \
+ fonts/Makefile                   \
+ images/Makefile                  \
+ models/Makefile                  \
+ oggs/Makefile		          \
+ src/Makefile                     \
+ src/robots/Makefile              \
+ src/bullet/Makefile              \
+ src/bullet/src/Makefile          \
+ src/bullet/Demos/OpenGL/Makefile \
+ wavs/Makefile                    \
+ wavs/radio/Makefile              \
+ wavs/tintagel/Makefile           \
  models/herrings/Makefile
 ])
 AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fd33d5307..8f5eed7c4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,7 @@
-# contrib/
+# doc
 
-EXTRA_DIST = 
+SUBDIRS      = players_manual
+
+pkgdatadir   = $(datadir)/games/@PACKAGE@/doc
+
+EXTRA_DIST   = conventions.txt implementation.txt robots.txt 
diff --git a/doc/players_manual/Makefile.am b/doc/players_manual/Makefile.am
new file mode 100644
index 000000000..8b03d5099
--- /dev/null
+++ b/doc/players_manual/Makefile.am
@@ -0,0 +1,7 @@
+# doc/players_manual
+
+pkgdatadir   = $(datadir)/games/@PACKAGE@/doc/players_manual
+
+pkgdata_DATA = manual.html $(wildcard *.png)
+
+EXTRA_DIST   = $(pkgdata_DATA)
diff --git a/doc/robots.txt b/doc/robots.txt
index e7fdd384c..5147412c6 100755
--- a/doc/robots.txt
+++ b/doc/robots.txt
@@ -1,6 +1,6 @@
 To create a robot, here is what you should do:
 
-- There is a template for the robots in the contrib/ directory, modify it
+- There is a template for the robots in the src/robots directory, modify it
   to create your own robot, the files are named empty_robot.cpp and
   empty_robot.hpp .
 - Name your source file <name of robot>_robot.cpp, and your header as
diff --git a/src/Makefile.am b/src/Makefile.am
index b9ac52d0d..b6b732b13 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -124,7 +124,7 @@ supertuxkart_SOURCES =             main.cpp  			\
 	replay_player.hpp          replay_player.cpp		\
 	replay_recorder.hpp	   replay_recorder.cpp       	\
 	ide/vc8/supertuxkart.sln   ide/vc8/supertuxkart.vcproj	\
-	ide/vc8/bullet_lib.vcproj
+	ide/vc8/bullet_lib.vcproj  ide/vc8/README
 
 
 # Link in the specific gcc 4.1 bug work around
@@ -135,3 +135,6 @@ supertuxkart_LDADD = -L. -lstatic_ssg \
 .PHONY: pot
 pot:
 	xgettext -o supertuxkart.pot -k_ --c++ *.?pp */*.?pp
+
+SUBDIRS = robots
+
diff --git a/src/bullet/Demos/OpenGL/CMakeLists.txt b/src/bullet/Demos/OpenGL/CMakeLists.txt
deleted file mode 100644
index 337d3ad52..000000000
--- a/src/bullet/Demos/OpenGL/CMakeLists.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-# This is basically the overall name of the project in Visual Studio this is the name of the Solution File
-
-
-# For every executable you have with a main method you should have an add_executable line below.
-# For every add executable line you should list every .cpp and .h file you have associated with that executable.  
-
-
-# This is the variable for Windows.  I use this to define the root of my directory structure.
-SET(GLUT_ROOT ${BULLET_PHYSICS_SOURCE_DIR}/glut)
-
-# You shouldn't have to modify anything below this line 
-########################################################
-
-
-# This is the shortcut to finding GLU, GLUT and OpenGL if they are properly installed on your system
-# This should be the case.
-INCLUDE (${CMAKE_ROOT}/Modules/FindGLU.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/FindGLUT.cmake) 
-INCLUDE (${CMAKE_ROOT}/Modules/FindOpenGL.cmake)
-
-
-IF (WIN32)
-  # This is the Windows code for which Opengl, and Glut are not properly installed
-  # since I can't install them I must cheat and copy libraries around
-  INCLUDE_DIRECTORIES(${GLUT_ROOT}) 
- # LINK_DIRECTORIES(${GLUT_ROOT}\\lib)
- # IF (${GLUT_glut_LIBRARY} MATCHES "GLUT_glut_LIBRARY-NOTFOUND")
- #   LINK_LIBRARIES(${GLUT_ROOT}\\lib\\glut32 ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY})
- #   TARGET_LINK_LIBRARIES(table ${GLUT_ROOT}\\lib\\glut32)
-#
-#    ADD_CUSTOM_COMMAND(TARGET table POST_BUILD COMMAND copy ${GLUT_ROOT}\\lib\\glut32.dll ${GLUT_ROOT}\\bin\\vs2005\\Debug
-#                        COMMAND copy ${GLUT_ROOT}\\lib\\glut32.dll ${GLUT_ROOT}\\bin\\vs2003\\Debug 
-#            COMMAND copy ${GLUT_ROOT}\\lib\\glut32.dll ${GLUT_ROOT}\\bin\\vs6\\Debug)
-#  ELSE (${GLUT_glut_LIBRARY} MATCHES "GLUT_glut_LIBRARY-NOTFOUND")
-#    LINK_LIBRARIES(${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) 
-#    TARGET_LINK_LIBRARIES(table ${GLUT_glut_LIBRARY})
-#  ENDIF(${GLUT_glut_LIBRARY} MATCHES "GLUT_glut_LIBRARY-NOTFOUND")
-#  TARGET_LINK_LIBRARIES(table ${OPENGL_gl_LIBRARY})
-#  TARGET_LINK_LIBRARIES(table ${OPENGL_glu_LIBRARY}) 
-ELSE (WIN32)
-  # This is the lines for linux.  This should always work if everything is installed and working fine.
-#  SET(CMAKE_BUILD_TYPE Debug)
-#  SET(CMAKE_CXX_FLAGS_DEBUG "-g")
-  INCLUDE_DIRECTORIES(/usr/include /usr/local/include ${GLUT_INCLUDE_DIR}) 
-#  TARGET_LINK_LIBRARIES(table ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
-#  TARGET_LINK_LIBRARIES(checker ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
-ENDIF (WIN32)
-
-INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src  }
-)
-
-ADD_LIBRARY(LibOpenGLSupport
-		BMF_Api.cpp
-		BMF_BitmapFont.cpp
-		BMF_font_helv10.cpp
-		GL_ShapeDrawer.cpp
-		GL_Simplex1to4.cpp
-		GLDebugDrawer.cpp
-		GlutStuff.cpp
-		RenderTexture.cpp
-		DemoApplication.cpp
-)
diff --git a/src/bullet/Makefile.am b/src/bullet/Makefile.am
index 72093c850..1b63a28dc 100644
--- a/src/bullet/Makefile.am
+++ b/src/bullet/Makefile.am
@@ -1 +1,5 @@
-SUBDIRS=src Demos/OpenGL 
\ No newline at end of file
+SUBDIRS=src Demos/OpenGL 
+
+EXTRA_DIST = BulletLicense.txt ChangeLog.txt copy_bullet_files \
+	     LICENSE README VERSION
+
diff --git a/src/robots/Makefile.am b/src/robots/Makefile.am
new file mode 100644
index 000000000..bb0e3bd9e
--- /dev/null
+++ b/src/robots/Makefile.am
@@ -0,0 +1,4 @@
+# src/robots
+
+EXTRA_DIST = empty_robot.cpp empty_robot.hpp
+
diff --git a/tools/robots/empty_robot.cpp b/src/robots/empty_robot.cpp
similarity index 100%
rename from tools/robots/empty_robot.cpp
rename to src/robots/empty_robot.cpp
diff --git a/tools/robots/empty_robot.hpp b/src/robots/empty_robot.hpp
similarity index 100%
rename from tools/robots/empty_robot.hpp
rename to src/robots/empty_robot.hpp