diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7acc5af1..f47e39ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,14 +17,14 @@ include(CheckSymbolExists)
 find_package(OpenGL REQUIRED)
 
 set(common_SOURCES 
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib/enable.c 
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib/fullscreen.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib/glext.c 
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib/init.c 
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib/input.c 
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib/joystick.c 
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib/time.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib/window.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/enable.c 
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/fullscreen.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/glext.c 
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/init.c 
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/input.c 
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/joystick.c 
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/time.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/window.c
 )
 
 # Stuff specific to WGL on Win32
@@ -37,7 +37,7 @@ if (WIN32)
     list(APPEND GLFW_LIBRARIES ${OPENGL_gl_LIBRARY})
 
     # Select platform specific code
-    add_subdirectory(lib/win32)
+    add_subdirectory(src/win32)
 endif (WIN32)
 
 # Stuff specific to GLX on Unix-like platforms
@@ -91,7 +91,7 @@ if (UNIX AND NOT APPLE AND NOT CYGWIN)
            NOT _GLFW_HAS_GLXGETPROCADDRESSEXT)
 
     # Select platform specific code
-    add_subdirectory(lib/x11)
+    add_subdirectory(src/x11)
 endif(UNIX AND NOT APPLE AND NOT CYGWIN)
 
 # Stuff specific to AGL and CGL on Mac OS X
@@ -109,7 +109,7 @@ if (UNIX AND APPLE)
     list(APPEND GLFW_LIBRARIES ${OPENGL_gl_LIBRARY})
 
     # Select platform specific code
-    add_subdirectory(lib/cocoa)
+    add_subdirectory(src/cocoa)
 endif(UNIX AND APPLE)
 
 add_subdirectory(examples)
diff --git a/lib/carbon/CMakeLists.txt b/src/carbon/CMakeLists.txt
similarity index 100%
rename from lib/carbon/CMakeLists.txt
rename to src/carbon/CMakeLists.txt
diff --git a/lib/carbon/carbon_enable.c b/src/carbon/carbon_enable.c
similarity index 100%
rename from lib/carbon/carbon_enable.c
rename to src/carbon/carbon_enable.c
diff --git a/lib/carbon/carbon_fullscreen.c b/src/carbon/carbon_fullscreen.c
similarity index 100%
rename from lib/carbon/carbon_fullscreen.c
rename to src/carbon/carbon_fullscreen.c
diff --git a/lib/carbon/carbon_glext.c b/src/carbon/carbon_glext.c
similarity index 100%
rename from lib/carbon/carbon_glext.c
rename to src/carbon/carbon_glext.c
diff --git a/lib/carbon/carbon_init.c b/src/carbon/carbon_init.c
similarity index 100%
rename from lib/carbon/carbon_init.c
rename to src/carbon/carbon_init.c
diff --git a/lib/carbon/carbon_joystick.c b/src/carbon/carbon_joystick.c
similarity index 100%
rename from lib/carbon/carbon_joystick.c
rename to src/carbon/carbon_joystick.c
diff --git a/lib/carbon/carbon_time.c b/src/carbon/carbon_time.c
similarity index 100%
rename from lib/carbon/carbon_time.c
rename to src/carbon/carbon_time.c
diff --git a/lib/carbon/carbon_window.c b/src/carbon/carbon_window.c
similarity index 100%
rename from lib/carbon/carbon_window.c
rename to src/carbon/carbon_window.c
diff --git a/lib/carbon/libglfw.pc.cmake b/src/carbon/libglfw.pc.cmake
similarity index 100%
rename from lib/carbon/libglfw.pc.cmake
rename to src/carbon/libglfw.pc.cmake
diff --git a/lib/carbon/platform.h b/src/carbon/platform.h
similarity index 100%
rename from lib/carbon/platform.h
rename to src/carbon/platform.h
diff --git a/lib/cocoa/CMakeLists.txt b/src/cocoa/CMakeLists.txt
similarity index 100%
rename from lib/cocoa/CMakeLists.txt
rename to src/cocoa/CMakeLists.txt
diff --git a/lib/cocoa/cocoa_enable.m b/src/cocoa/cocoa_enable.m
similarity index 100%
rename from lib/cocoa/cocoa_enable.m
rename to src/cocoa/cocoa_enable.m
diff --git a/lib/cocoa/cocoa_fullscreen.m b/src/cocoa/cocoa_fullscreen.m
similarity index 100%
rename from lib/cocoa/cocoa_fullscreen.m
rename to src/cocoa/cocoa_fullscreen.m
diff --git a/lib/cocoa/cocoa_glext.m b/src/cocoa/cocoa_glext.m
similarity index 100%
rename from lib/cocoa/cocoa_glext.m
rename to src/cocoa/cocoa_glext.m
diff --git a/lib/cocoa/cocoa_init.m b/src/cocoa/cocoa_init.m
similarity index 100%
rename from lib/cocoa/cocoa_init.m
rename to src/cocoa/cocoa_init.m
diff --git a/lib/cocoa/cocoa_joystick.m b/src/cocoa/cocoa_joystick.m
similarity index 100%
rename from lib/cocoa/cocoa_joystick.m
rename to src/cocoa/cocoa_joystick.m
diff --git a/lib/cocoa/cocoa_time.m b/src/cocoa/cocoa_time.m
similarity index 100%
rename from lib/cocoa/cocoa_time.m
rename to src/cocoa/cocoa_time.m
diff --git a/lib/cocoa/cocoa_window.m b/src/cocoa/cocoa_window.m
similarity index 100%
rename from lib/cocoa/cocoa_window.m
rename to src/cocoa/cocoa_window.m
diff --git a/lib/cocoa/libglfw.pc.cmake b/src/cocoa/libglfw.pc.cmake
similarity index 100%
rename from lib/cocoa/libglfw.pc.cmake
rename to src/cocoa/libglfw.pc.cmake
diff --git a/lib/cocoa/platform.h b/src/cocoa/platform.h
similarity index 100%
rename from lib/cocoa/platform.h
rename to src/cocoa/platform.h
diff --git a/lib/enable.c b/src/enable.c
similarity index 100%
rename from lib/enable.c
rename to src/enable.c
diff --git a/lib/fullscreen.c b/src/fullscreen.c
similarity index 100%
rename from lib/fullscreen.c
rename to src/fullscreen.c
diff --git a/lib/glext.c b/src/glext.c
similarity index 100%
rename from lib/glext.c
rename to src/glext.c
diff --git a/lib/init.c b/src/init.c
similarity index 100%
rename from lib/init.c
rename to src/init.c
diff --git a/lib/input.c b/src/input.c
similarity index 100%
rename from lib/input.c
rename to src/input.c
diff --git a/lib/internal.h b/src/internal.h
similarity index 100%
rename from lib/internal.h
rename to src/internal.h
diff --git a/lib/joystick.c b/src/joystick.c
similarity index 100%
rename from lib/joystick.c
rename to src/joystick.c
diff --git a/lib/time.c b/src/time.c
similarity index 100%
rename from lib/time.c
rename to src/time.c
diff --git a/lib/win32/CMakeLists.txt b/src/win32/CMakeLists.txt
similarity index 100%
rename from lib/win32/CMakeLists.txt
rename to src/win32/CMakeLists.txt
diff --git a/lib/win32/glfwdll.def b/src/win32/glfwdll.def
similarity index 100%
rename from lib/win32/glfwdll.def
rename to src/win32/glfwdll.def
diff --git a/lib/win32/glfwdll_mgw1.def b/src/win32/glfwdll_mgw1.def
similarity index 100%
rename from lib/win32/glfwdll_mgw1.def
rename to src/win32/glfwdll_mgw1.def
diff --git a/lib/win32/glfwdll_mgw2.def b/src/win32/glfwdll_mgw2.def
similarity index 100%
rename from lib/win32/glfwdll_mgw2.def
rename to src/win32/glfwdll_mgw2.def
diff --git a/lib/win32/libglfw.pc.cmake b/src/win32/libglfw.pc.cmake
similarity index 100%
rename from lib/win32/libglfw.pc.cmake
rename to src/win32/libglfw.pc.cmake
diff --git a/lib/win32/platform.h b/src/win32/platform.h
similarity index 100%
rename from lib/win32/platform.h
rename to src/win32/platform.h
diff --git a/lib/win32/win32_dllmain.c b/src/win32/win32_dllmain.c
similarity index 100%
rename from lib/win32/win32_dllmain.c
rename to src/win32/win32_dllmain.c
diff --git a/lib/win32/win32_enable.c b/src/win32/win32_enable.c
similarity index 100%
rename from lib/win32/win32_enable.c
rename to src/win32/win32_enable.c
diff --git a/lib/win32/win32_fullscreen.c b/src/win32/win32_fullscreen.c
similarity index 100%
rename from lib/win32/win32_fullscreen.c
rename to src/win32/win32_fullscreen.c
diff --git a/lib/win32/win32_glext.c b/src/win32/win32_glext.c
similarity index 100%
rename from lib/win32/win32_glext.c
rename to src/win32/win32_glext.c
diff --git a/lib/win32/win32_init.c b/src/win32/win32_init.c
similarity index 100%
rename from lib/win32/win32_init.c
rename to src/win32/win32_init.c
diff --git a/lib/win32/win32_joystick.c b/src/win32/win32_joystick.c
similarity index 100%
rename from lib/win32/win32_joystick.c
rename to src/win32/win32_joystick.c
diff --git a/lib/win32/win32_time.c b/src/win32/win32_time.c
similarity index 100%
rename from lib/win32/win32_time.c
rename to src/win32/win32_time.c
diff --git a/lib/win32/win32_window.c b/src/win32/win32_window.c
similarity index 100%
rename from lib/win32/win32_window.c
rename to src/win32/win32_window.c
diff --git a/lib/window.c b/src/window.c
similarity index 100%
rename from lib/window.c
rename to src/window.c
diff --git a/lib/x11/CMakeLists.txt b/src/x11/CMakeLists.txt
similarity index 100%
rename from lib/x11/CMakeLists.txt
rename to src/x11/CMakeLists.txt
diff --git a/lib/x11/libglfw.pc.cmake b/src/x11/libglfw.pc.cmake
similarity index 100%
rename from lib/x11/libglfw.pc.cmake
rename to src/x11/libglfw.pc.cmake
diff --git a/lib/x11/platform.h b/src/x11/platform.h
similarity index 100%
rename from lib/x11/platform.h
rename to src/x11/platform.h
diff --git a/lib/x11/x11_config.h.cmake b/src/x11/x11_config.h.cmake
similarity index 100%
rename from lib/x11/x11_config.h.cmake
rename to src/x11/x11_config.h.cmake
diff --git a/lib/x11/x11_enable.c b/src/x11/x11_enable.c
similarity index 100%
rename from lib/x11/x11_enable.c
rename to src/x11/x11_enable.c
diff --git a/lib/x11/x11_fullscreen.c b/src/x11/x11_fullscreen.c
similarity index 100%
rename from lib/x11/x11_fullscreen.c
rename to src/x11/x11_fullscreen.c
diff --git a/lib/x11/x11_glext.c b/src/x11/x11_glext.c
similarity index 100%
rename from lib/x11/x11_glext.c
rename to src/x11/x11_glext.c
diff --git a/lib/x11/x11_init.c b/src/x11/x11_init.c
similarity index 100%
rename from lib/x11/x11_init.c
rename to src/x11/x11_init.c
diff --git a/lib/x11/x11_joystick.c b/src/x11/x11_joystick.c
similarity index 100%
rename from lib/x11/x11_joystick.c
rename to src/x11/x11_joystick.c
diff --git a/lib/x11/x11_keysym2unicode.c b/src/x11/x11_keysym2unicode.c
similarity index 100%
rename from lib/x11/x11_keysym2unicode.c
rename to src/x11/x11_keysym2unicode.c
diff --git a/lib/x11/x11_time.c b/src/x11/x11_time.c
similarity index 100%
rename from lib/x11/x11_time.c
rename to src/x11/x11_time.c
diff --git a/lib/x11/x11_window.c b/src/x11/x11_window.c
similarity index 100%
rename from lib/x11/x11_window.c
rename to src/x11/x11_window.c