diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5e56e04
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/libs/predef/doc/build.jam b/doc/build.jam
similarity index 91%
rename from libs/predef/doc/build.jam
rename to doc/build.jam
index f08a366..e918d5f 100644
--- a/libs/predef/doc/build.jam
+++ b/doc/build.jam
@@ -11,13 +11,13 @@ if ! $(BOOST_ROOT)
     BOOST_ROOT = [ modules.peek : BOOST_ROOT ] ;
 }
 
-local BOOST_PREDEF_HEADERS = [ path.glob-tree $(BOOST_PREDEF_ROOT)/boost/predef : *.h ] ;
+local BOOST_PREDEF_HEADERS = [ path.glob-tree $(BOOST_PREDEF_ROOT)/include/boost/predef : *.h ] ;
 
 xml predef
     :
         predef.qbk
     :
-        <dependency>$(BOOST_PREDEF_ROOT)/boost/predef.h
+        <dependency>$(BOOST_PREDEF_ROOT)/include/boost/predef.h
         <dependency>$(BOOST_PREDEF_HEADERS)
     ;
 explicit predef ;
diff --git a/libs/predef/doc/html/boostbook.css b/doc/html/boostbook.css
similarity index 100%
rename from libs/predef/doc/html/boostbook.css
rename to doc/html/boostbook.css
diff --git a/libs/predef/doc/html/docutils.css b/doc/html/docutils.css
similarity index 100%
rename from libs/predef/doc/html/docutils.css
rename to doc/html/docutils.css
diff --git a/libs/predef/doc/html/images/alert.png b/doc/html/images/alert.png
similarity index 100%
rename from libs/predef/doc/html/images/alert.png
rename to doc/html/images/alert.png
diff --git a/libs/predef/doc/html/images/blank.png b/doc/html/images/blank.png
similarity index 100%
rename from libs/predef/doc/html/images/blank.png
rename to doc/html/images/blank.png
diff --git a/libs/predef/doc/html/images/callouts/1.png b/doc/html/images/callouts/1.png
similarity index 100%
rename from libs/predef/doc/html/images/callouts/1.png
rename to doc/html/images/callouts/1.png
diff --git a/libs/predef/doc/html/images/callouts/10.png b/doc/html/images/callouts/10.png
similarity index 100%
rename from libs/predef/doc/html/images/callouts/10.png
rename to doc/html/images/callouts/10.png
diff --git a/libs/predef/doc/html/images/callouts/11.png b/doc/html/images/callouts/11.png
similarity index 100%
rename from libs/predef/doc/html/images/callouts/11.png
rename to doc/html/images/callouts/11.png
diff --git a/libs/predef/doc/html/images/callouts/12.png b/doc/html/images/callouts/12.png
similarity index 100%
rename from libs/predef/doc/html/images/callouts/12.png
rename to doc/html/images/callouts/12.png
diff --git a/libs/predef/doc/html/images/callouts/13.png b/doc/html/images/callouts/13.png
similarity index 100%
rename from libs/predef/doc/html/images/callouts/13.png
rename to doc/html/images/callouts/13.png
diff --git a/libs/predef/doc/html/images/callouts/14.png b/doc/html/images/callouts/14.png
similarity index 100%
rename from libs/predef/doc/html/images/callouts/14.png
rename to doc/html/images/callouts/14.png
diff --git a/libs/predef/doc/html/images/callouts/15.png b/doc/html/images/callouts/15.png
similarity index 100%
rename from libs/predef/doc/html/images/callouts/15.png
rename to doc/html/images/callouts/15.png
diff --git a/libs/predef/doc/html/images/callouts/2.png b/doc/html/images/callouts/2.png
similarity index 100%
rename from libs/predef/doc/html/images/callouts/2.png
rename to doc/html/images/callouts/2.png
diff --git a/libs/predef/doc/html/images/callouts/3.png b/doc/html/images/callouts/3.png
similarity index 100%
rename from libs/predef/doc/html/images/callouts/3.png
rename to doc/html/images/callouts/3.png
diff --git a/libs/predef/doc/html/images/callouts/4.png b/doc/html/images/callouts/4.png
similarity index 100%
rename from libs/predef/doc/html/images/callouts/4.png
rename to doc/html/images/callouts/4.png
diff --git a/libs/predef/doc/html/images/callouts/5.png b/doc/html/images/callouts/5.png
similarity index 100%
rename from libs/predef/doc/html/images/callouts/5.png
rename to doc/html/images/callouts/5.png
diff --git a/libs/predef/doc/html/images/callouts/6.png b/doc/html/images/callouts/6.png
similarity index 100%
rename from libs/predef/doc/html/images/callouts/6.png
rename to doc/html/images/callouts/6.png
diff --git a/libs/predef/doc/html/images/callouts/7.png b/doc/html/images/callouts/7.png
similarity index 100%
rename from libs/predef/doc/html/images/callouts/7.png
rename to doc/html/images/callouts/7.png
diff --git a/libs/predef/doc/html/images/callouts/8.png b/doc/html/images/callouts/8.png
similarity index 100%
rename from libs/predef/doc/html/images/callouts/8.png
rename to doc/html/images/callouts/8.png
diff --git a/libs/predef/doc/html/images/callouts/9.png b/doc/html/images/callouts/9.png
similarity index 100%
rename from libs/predef/doc/html/images/callouts/9.png
rename to doc/html/images/callouts/9.png
diff --git a/libs/predef/doc/html/images/caution.png b/doc/html/images/caution.png
similarity index 100%
rename from libs/predef/doc/html/images/caution.png
rename to doc/html/images/caution.png
diff --git a/libs/predef/doc/html/images/draft.png b/doc/html/images/draft.png
similarity index 100%
rename from libs/predef/doc/html/images/draft.png
rename to doc/html/images/draft.png
diff --git a/libs/predef/doc/html/images/home.png b/doc/html/images/home.png
similarity index 100%
rename from libs/predef/doc/html/images/home.png
rename to doc/html/images/home.png
diff --git a/libs/predef/doc/html/images/important.png b/doc/html/images/important.png
similarity index 100%
rename from libs/predef/doc/html/images/important.png
rename to doc/html/images/important.png
diff --git a/libs/predef/doc/html/images/next.png b/doc/html/images/next.png
similarity index 100%
rename from libs/predef/doc/html/images/next.png
rename to doc/html/images/next.png
diff --git a/libs/predef/doc/html/images/next_disabled.png b/doc/html/images/next_disabled.png
similarity index 100%
rename from libs/predef/doc/html/images/next_disabled.png
rename to doc/html/images/next_disabled.png
diff --git a/libs/predef/doc/html/images/note.png b/doc/html/images/note.png
similarity index 100%
rename from libs/predef/doc/html/images/note.png
rename to doc/html/images/note.png
diff --git a/libs/predef/doc/html/images/prev.png b/doc/html/images/prev.png
similarity index 100%
rename from libs/predef/doc/html/images/prev.png
rename to doc/html/images/prev.png
diff --git a/libs/predef/doc/html/images/prev_disabled.png b/doc/html/images/prev_disabled.png
similarity index 100%
rename from libs/predef/doc/html/images/prev_disabled.png
rename to doc/html/images/prev_disabled.png
diff --git a/libs/predef/doc/html/images/smiley.png b/doc/html/images/smiley.png
similarity index 100%
rename from libs/predef/doc/html/images/smiley.png
rename to doc/html/images/smiley.png
diff --git a/libs/predef/doc/html/images/tip.png b/doc/html/images/tip.png
similarity index 100%
rename from libs/predef/doc/html/images/tip.png
rename to doc/html/images/tip.png
diff --git a/libs/predef/doc/html/images/toc-blank.png b/doc/html/images/toc-blank.png
similarity index 100%
rename from libs/predef/doc/html/images/toc-blank.png
rename to doc/html/images/toc-blank.png
diff --git a/libs/predef/doc/html/images/toc-minus.png b/doc/html/images/toc-minus.png
similarity index 100%
rename from libs/predef/doc/html/images/toc-minus.png
rename to doc/html/images/toc-minus.png
diff --git a/libs/predef/doc/html/images/toc-plus.png b/doc/html/images/toc-plus.png
similarity index 100%
rename from libs/predef/doc/html/images/toc-plus.png
rename to doc/html/images/toc-plus.png
diff --git a/libs/predef/doc/html/images/up.png b/doc/html/images/up.png
similarity index 100%
rename from libs/predef/doc/html/images/up.png
rename to doc/html/images/up.png
diff --git a/libs/predef/doc/html/images/up_disabled.png b/doc/html/images/up_disabled.png
similarity index 100%
rename from libs/predef/doc/html/images/up_disabled.png
rename to doc/html/images/up_disabled.png
diff --git a/libs/predef/doc/html/images/warning.png b/doc/html/images/warning.png
similarity index 100%
rename from libs/predef/doc/html/images/warning.png
rename to doc/html/images/warning.png
diff --git a/libs/predef/doc/html/index.html b/doc/html/index.html
similarity index 100%
rename from libs/predef/doc/html/index.html
rename to doc/html/index.html
diff --git a/libs/predef/doc/html/minimal.css b/doc/html/minimal.css
similarity index 100%
rename from libs/predef/doc/html/minimal.css
rename to doc/html/minimal.css
diff --git a/libs/predef/doc/html/predef/adding_new_predefs.html b/doc/html/predef/adding_new_predefs.html
similarity index 100%
rename from libs/predef/doc/html/predef/adding_new_predefs.html
rename to doc/html/predef/adding_new_predefs.html
diff --git a/libs/predef/doc/html/predef/introduction.html b/doc/html/predef/introduction.html
similarity index 100%
rename from libs/predef/doc/html/predef/introduction.html
rename to doc/html/predef/introduction.html
diff --git a/libs/predef/doc/html/predef/reference.html b/doc/html/predef/reference.html
similarity index 100%
rename from libs/predef/doc/html/predef/reference.html
rename to doc/html/predef/reference.html
diff --git a/libs/predef/doc/html/predef/using_the_predefs.html b/doc/html/predef/using_the_predefs.html
similarity index 100%
rename from libs/predef/doc/html/predef/using_the_predefs.html
rename to doc/html/predef/using_the_predefs.html
diff --git a/libs/predef/doc/html/reference.css b/doc/html/reference.css
similarity index 100%
rename from libs/predef/doc/html/reference.css
rename to doc/html/reference.css
diff --git a/libs/predef/doc/predef.qbk b/doc/predef.qbk
similarity index 100%
rename from libs/predef/doc/predef.qbk
rename to doc/predef.qbk
diff --git a/boost/predef.h b/include/boost/predef.h
similarity index 100%
rename from boost/predef.h
rename to include/boost/predef.h
diff --git a/boost/predef/architecture.h b/include/boost/predef/architecture.h
similarity index 100%
rename from boost/predef/architecture.h
rename to include/boost/predef/architecture.h
diff --git a/boost/predef/architecture/alpha.h b/include/boost/predef/architecture/alpha.h
similarity index 100%
rename from boost/predef/architecture/alpha.h
rename to include/boost/predef/architecture/alpha.h
diff --git a/boost/predef/architecture/amd64.h b/include/boost/predef/architecture/amd64.h
similarity index 100%
rename from boost/predef/architecture/amd64.h
rename to include/boost/predef/architecture/amd64.h
diff --git a/boost/predef/architecture/arm.h b/include/boost/predef/architecture/arm.h
similarity index 100%
rename from boost/predef/architecture/arm.h
rename to include/boost/predef/architecture/arm.h
diff --git a/boost/predef/architecture/convex.h b/include/boost/predef/architecture/convex.h
similarity index 100%
rename from boost/predef/architecture/convex.h
rename to include/boost/predef/architecture/convex.h
diff --git a/boost/predef/architecture/ia64.h b/include/boost/predef/architecture/ia64.h
similarity index 100%
rename from boost/predef/architecture/ia64.h
rename to include/boost/predef/architecture/ia64.h
diff --git a/boost/predef/architecture/m68k.h b/include/boost/predef/architecture/m68k.h
similarity index 100%
rename from boost/predef/architecture/m68k.h
rename to include/boost/predef/architecture/m68k.h
diff --git a/boost/predef/architecture/mips.h b/include/boost/predef/architecture/mips.h
similarity index 100%
rename from boost/predef/architecture/mips.h
rename to include/boost/predef/architecture/mips.h
diff --git a/boost/predef/architecture/parisc.h b/include/boost/predef/architecture/parisc.h
similarity index 100%
rename from boost/predef/architecture/parisc.h
rename to include/boost/predef/architecture/parisc.h
diff --git a/boost/predef/architecture/ppc.h b/include/boost/predef/architecture/ppc.h
similarity index 100%
rename from boost/predef/architecture/ppc.h
rename to include/boost/predef/architecture/ppc.h
diff --git a/boost/predef/architecture/pyramid.h b/include/boost/predef/architecture/pyramid.h
similarity index 100%
rename from boost/predef/architecture/pyramid.h
rename to include/boost/predef/architecture/pyramid.h
diff --git a/boost/predef/architecture/rs6k.h b/include/boost/predef/architecture/rs6k.h
similarity index 100%
rename from boost/predef/architecture/rs6k.h
rename to include/boost/predef/architecture/rs6k.h
diff --git a/boost/predef/architecture/sparc.h b/include/boost/predef/architecture/sparc.h
similarity index 100%
rename from boost/predef/architecture/sparc.h
rename to include/boost/predef/architecture/sparc.h
diff --git a/boost/predef/architecture/superh.h b/include/boost/predef/architecture/superh.h
similarity index 100%
rename from boost/predef/architecture/superh.h
rename to include/boost/predef/architecture/superh.h
diff --git a/boost/predef/architecture/sys370.h b/include/boost/predef/architecture/sys370.h
similarity index 100%
rename from boost/predef/architecture/sys370.h
rename to include/boost/predef/architecture/sys370.h
diff --git a/boost/predef/architecture/sys390.h b/include/boost/predef/architecture/sys390.h
similarity index 100%
rename from boost/predef/architecture/sys390.h
rename to include/boost/predef/architecture/sys390.h
diff --git a/boost/predef/architecture/x86.h b/include/boost/predef/architecture/x86.h
similarity index 100%
rename from boost/predef/architecture/x86.h
rename to include/boost/predef/architecture/x86.h
diff --git a/boost/predef/architecture/z.h b/include/boost/predef/architecture/z.h
similarity index 100%
rename from boost/predef/architecture/z.h
rename to include/boost/predef/architecture/z.h
diff --git a/boost/predef/compiler.h b/include/boost/predef/compiler.h
similarity index 100%
rename from boost/predef/compiler.h
rename to include/boost/predef/compiler.h
diff --git a/boost/predef/compiler/borland.h b/include/boost/predef/compiler/borland.h
similarity index 100%
rename from boost/predef/compiler/borland.h
rename to include/boost/predef/compiler/borland.h
diff --git a/boost/predef/compiler/clang.h b/include/boost/predef/compiler/clang.h
similarity index 100%
rename from boost/predef/compiler/clang.h
rename to include/boost/predef/compiler/clang.h
diff --git a/boost/predef/compiler/comeau.h b/include/boost/predef/compiler/comeau.h
similarity index 100%
rename from boost/predef/compiler/comeau.h
rename to include/boost/predef/compiler/comeau.h
diff --git a/boost/predef/compiler/compaq.h b/include/boost/predef/compiler/compaq.h
similarity index 100%
rename from boost/predef/compiler/compaq.h
rename to include/boost/predef/compiler/compaq.h
diff --git a/boost/predef/compiler/diab.h b/include/boost/predef/compiler/diab.h
similarity index 100%
rename from boost/predef/compiler/diab.h
rename to include/boost/predef/compiler/diab.h
diff --git a/boost/predef/compiler/digitalmars.h b/include/boost/predef/compiler/digitalmars.h
similarity index 100%
rename from boost/predef/compiler/digitalmars.h
rename to include/boost/predef/compiler/digitalmars.h
diff --git a/boost/predef/compiler/dignus.h b/include/boost/predef/compiler/dignus.h
similarity index 100%
rename from boost/predef/compiler/dignus.h
rename to include/boost/predef/compiler/dignus.h
diff --git a/boost/predef/compiler/edg.h b/include/boost/predef/compiler/edg.h
similarity index 100%
rename from boost/predef/compiler/edg.h
rename to include/boost/predef/compiler/edg.h
diff --git a/boost/predef/compiler/ekopath.h b/include/boost/predef/compiler/ekopath.h
similarity index 100%
rename from boost/predef/compiler/ekopath.h
rename to include/boost/predef/compiler/ekopath.h
diff --git a/boost/predef/compiler/gcc.h b/include/boost/predef/compiler/gcc.h
similarity index 100%
rename from boost/predef/compiler/gcc.h
rename to include/boost/predef/compiler/gcc.h
diff --git a/boost/predef/compiler/gcc_xml.h b/include/boost/predef/compiler/gcc_xml.h
similarity index 100%
rename from boost/predef/compiler/gcc_xml.h
rename to include/boost/predef/compiler/gcc_xml.h
diff --git a/boost/predef/compiler/greenhills.h b/include/boost/predef/compiler/greenhills.h
similarity index 100%
rename from boost/predef/compiler/greenhills.h
rename to include/boost/predef/compiler/greenhills.h
diff --git a/boost/predef/compiler/hp_acc.h b/include/boost/predef/compiler/hp_acc.h
similarity index 100%
rename from boost/predef/compiler/hp_acc.h
rename to include/boost/predef/compiler/hp_acc.h
diff --git a/boost/predef/compiler/iar.h b/include/boost/predef/compiler/iar.h
similarity index 100%
rename from boost/predef/compiler/iar.h
rename to include/boost/predef/compiler/iar.h
diff --git a/boost/predef/compiler/ibm.h b/include/boost/predef/compiler/ibm.h
similarity index 100%
rename from boost/predef/compiler/ibm.h
rename to include/boost/predef/compiler/ibm.h
diff --git a/boost/predef/compiler/intel.h b/include/boost/predef/compiler/intel.h
similarity index 100%
rename from boost/predef/compiler/intel.h
rename to include/boost/predef/compiler/intel.h
diff --git a/boost/predef/compiler/kai.h b/include/boost/predef/compiler/kai.h
similarity index 100%
rename from boost/predef/compiler/kai.h
rename to include/boost/predef/compiler/kai.h
diff --git a/boost/predef/compiler/llvm.h b/include/boost/predef/compiler/llvm.h
similarity index 100%
rename from boost/predef/compiler/llvm.h
rename to include/boost/predef/compiler/llvm.h
diff --git a/boost/predef/compiler/metaware.h b/include/boost/predef/compiler/metaware.h
similarity index 100%
rename from boost/predef/compiler/metaware.h
rename to include/boost/predef/compiler/metaware.h
diff --git a/boost/predef/compiler/metrowerks.h b/include/boost/predef/compiler/metrowerks.h
similarity index 100%
rename from boost/predef/compiler/metrowerks.h
rename to include/boost/predef/compiler/metrowerks.h
diff --git a/boost/predef/compiler/microtec.h b/include/boost/predef/compiler/microtec.h
similarity index 100%
rename from boost/predef/compiler/microtec.h
rename to include/boost/predef/compiler/microtec.h
diff --git a/boost/predef/compiler/mingw.h b/include/boost/predef/compiler/mingw.h
similarity index 100%
rename from boost/predef/compiler/mingw.h
rename to include/boost/predef/compiler/mingw.h
diff --git a/boost/predef/compiler/mpw.h b/include/boost/predef/compiler/mpw.h
similarity index 100%
rename from boost/predef/compiler/mpw.h
rename to include/boost/predef/compiler/mpw.h
diff --git a/boost/predef/compiler/palm.h b/include/boost/predef/compiler/palm.h
similarity index 100%
rename from boost/predef/compiler/palm.h
rename to include/boost/predef/compiler/palm.h
diff --git a/boost/predef/compiler/pgi.h b/include/boost/predef/compiler/pgi.h
similarity index 100%
rename from boost/predef/compiler/pgi.h
rename to include/boost/predef/compiler/pgi.h
diff --git a/boost/predef/compiler/sgi_mipspro.h b/include/boost/predef/compiler/sgi_mipspro.h
similarity index 100%
rename from boost/predef/compiler/sgi_mipspro.h
rename to include/boost/predef/compiler/sgi_mipspro.h
diff --git a/boost/predef/compiler/sunpro.h b/include/boost/predef/compiler/sunpro.h
similarity index 100%
rename from boost/predef/compiler/sunpro.h
rename to include/boost/predef/compiler/sunpro.h
diff --git a/boost/predef/compiler/tendra.h b/include/boost/predef/compiler/tendra.h
similarity index 100%
rename from boost/predef/compiler/tendra.h
rename to include/boost/predef/compiler/tendra.h
diff --git a/boost/predef/compiler/visualc.h b/include/boost/predef/compiler/visualc.h
similarity index 100%
rename from boost/predef/compiler/visualc.h
rename to include/boost/predef/compiler/visualc.h
diff --git a/boost/predef/compiler/watcom.h b/include/boost/predef/compiler/watcom.h
similarity index 100%
rename from boost/predef/compiler/watcom.h
rename to include/boost/predef/compiler/watcom.h
diff --git a/boost/predef/detail/_cassert.h b/include/boost/predef/detail/_cassert.h
similarity index 100%
rename from boost/predef/detail/_cassert.h
rename to include/boost/predef/detail/_cassert.h
diff --git a/boost/predef/detail/_exception.h b/include/boost/predef/detail/_exception.h
similarity index 100%
rename from boost/predef/detail/_exception.h
rename to include/boost/predef/detail/_exception.h
diff --git a/boost/predef/detail/test.h b/include/boost/predef/detail/test.h
similarity index 100%
rename from boost/predef/detail/test.h
rename to include/boost/predef/detail/test.h
diff --git a/boost/predef/language.h b/include/boost/predef/language.h
similarity index 100%
rename from boost/predef/language.h
rename to include/boost/predef/language.h
diff --git a/boost/predef/language/objc.h b/include/boost/predef/language/objc.h
similarity index 100%
rename from boost/predef/language/objc.h
rename to include/boost/predef/language/objc.h
diff --git a/boost/predef/language/stdc.h b/include/boost/predef/language/stdc.h
similarity index 100%
rename from boost/predef/language/stdc.h
rename to include/boost/predef/language/stdc.h
diff --git a/boost/predef/language/stdcpp.h b/include/boost/predef/language/stdcpp.h
similarity index 100%
rename from boost/predef/language/stdcpp.h
rename to include/boost/predef/language/stdcpp.h
diff --git a/boost/predef/library.h b/include/boost/predef/library.h
similarity index 100%
rename from boost/predef/library.h
rename to include/boost/predef/library.h
diff --git a/boost/predef/library/c.h b/include/boost/predef/library/c.h
similarity index 100%
rename from boost/predef/library/c.h
rename to include/boost/predef/library/c.h
diff --git a/boost/predef/library/c/gnu.h b/include/boost/predef/library/c/gnu.h
similarity index 100%
rename from boost/predef/library/c/gnu.h
rename to include/boost/predef/library/c/gnu.h
diff --git a/boost/predef/library/c/uc.h b/include/boost/predef/library/c/uc.h
similarity index 100%
rename from boost/predef/library/c/uc.h
rename to include/boost/predef/library/c/uc.h
diff --git a/boost/predef/library/c/vms.h b/include/boost/predef/library/c/vms.h
similarity index 100%
rename from boost/predef/library/c/vms.h
rename to include/boost/predef/library/c/vms.h
diff --git a/boost/predef/library/c/zos.h b/include/boost/predef/library/c/zos.h
similarity index 100%
rename from boost/predef/library/c/zos.h
rename to include/boost/predef/library/c/zos.h
diff --git a/boost/predef/library/std.h b/include/boost/predef/library/std.h
similarity index 100%
rename from boost/predef/library/std.h
rename to include/boost/predef/library/std.h
diff --git a/boost/predef/library/std/cxx.h b/include/boost/predef/library/std/cxx.h
similarity index 100%
rename from boost/predef/library/std/cxx.h
rename to include/boost/predef/library/std/cxx.h
diff --git a/boost/predef/library/std/dinkumware.h b/include/boost/predef/library/std/dinkumware.h
similarity index 100%
rename from boost/predef/library/std/dinkumware.h
rename to include/boost/predef/library/std/dinkumware.h
diff --git a/boost/predef/library/std/libcomo.h b/include/boost/predef/library/std/libcomo.h
similarity index 100%
rename from boost/predef/library/std/libcomo.h
rename to include/boost/predef/library/std/libcomo.h
diff --git a/boost/predef/library/std/modena.h b/include/boost/predef/library/std/modena.h
similarity index 100%
rename from boost/predef/library/std/modena.h
rename to include/boost/predef/library/std/modena.h
diff --git a/boost/predef/library/std/msl.h b/include/boost/predef/library/std/msl.h
similarity index 100%
rename from boost/predef/library/std/msl.h
rename to include/boost/predef/library/std/msl.h
diff --git a/boost/predef/library/std/roguewave.h b/include/boost/predef/library/std/roguewave.h
similarity index 100%
rename from boost/predef/library/std/roguewave.h
rename to include/boost/predef/library/std/roguewave.h
diff --git a/boost/predef/library/std/sgi.h b/include/boost/predef/library/std/sgi.h
similarity index 100%
rename from boost/predef/library/std/sgi.h
rename to include/boost/predef/library/std/sgi.h
diff --git a/boost/predef/library/std/stdcpp3.h b/include/boost/predef/library/std/stdcpp3.h
similarity index 100%
rename from boost/predef/library/std/stdcpp3.h
rename to include/boost/predef/library/std/stdcpp3.h
diff --git a/boost/predef/library/std/stlport.h b/include/boost/predef/library/std/stlport.h
similarity index 100%
rename from boost/predef/library/std/stlport.h
rename to include/boost/predef/library/std/stlport.h
diff --git a/boost/predef/library/std/vacpp.h b/include/boost/predef/library/std/vacpp.h
similarity index 100%
rename from boost/predef/library/std/vacpp.h
rename to include/boost/predef/library/std/vacpp.h
diff --git a/boost/predef/make.h b/include/boost/predef/make.h
similarity index 100%
rename from boost/predef/make.h
rename to include/boost/predef/make.h
diff --git a/boost/predef/os.h b/include/boost/predef/os.h
similarity index 100%
rename from boost/predef/os.h
rename to include/boost/predef/os.h
diff --git a/boost/predef/os/aix.h b/include/boost/predef/os/aix.h
similarity index 100%
rename from boost/predef/os/aix.h
rename to include/boost/predef/os/aix.h
diff --git a/boost/predef/os/amigaos.h b/include/boost/predef/os/amigaos.h
similarity index 100%
rename from boost/predef/os/amigaos.h
rename to include/boost/predef/os/amigaos.h
diff --git a/boost/predef/os/beos.h b/include/boost/predef/os/beos.h
similarity index 100%
rename from boost/predef/os/beos.h
rename to include/boost/predef/os/beos.h
diff --git a/boost/predef/os/bsd.h b/include/boost/predef/os/bsd.h
similarity index 100%
rename from boost/predef/os/bsd.h
rename to include/boost/predef/os/bsd.h
diff --git a/boost/predef/os/bsd/bsdi.h b/include/boost/predef/os/bsd/bsdi.h
similarity index 100%
rename from boost/predef/os/bsd/bsdi.h
rename to include/boost/predef/os/bsd/bsdi.h
diff --git a/boost/predef/os/bsd/dragonfly.h b/include/boost/predef/os/bsd/dragonfly.h
similarity index 100%
rename from boost/predef/os/bsd/dragonfly.h
rename to include/boost/predef/os/bsd/dragonfly.h
diff --git a/boost/predef/os/bsd/free.h b/include/boost/predef/os/bsd/free.h
similarity index 100%
rename from boost/predef/os/bsd/free.h
rename to include/boost/predef/os/bsd/free.h
diff --git a/boost/predef/os/bsd/net.h b/include/boost/predef/os/bsd/net.h
similarity index 100%
rename from boost/predef/os/bsd/net.h
rename to include/boost/predef/os/bsd/net.h
diff --git a/boost/predef/os/bsd/open.h b/include/boost/predef/os/bsd/open.h
similarity index 100%
rename from boost/predef/os/bsd/open.h
rename to include/boost/predef/os/bsd/open.h
diff --git a/boost/predef/os/cygwin.h b/include/boost/predef/os/cygwin.h
similarity index 100%
rename from boost/predef/os/cygwin.h
rename to include/boost/predef/os/cygwin.h
diff --git a/boost/predef/os/hpux.h b/include/boost/predef/os/hpux.h
similarity index 100%
rename from boost/predef/os/hpux.h
rename to include/boost/predef/os/hpux.h
diff --git a/boost/predef/os/irix.h b/include/boost/predef/os/irix.h
similarity index 100%
rename from boost/predef/os/irix.h
rename to include/boost/predef/os/irix.h
diff --git a/boost/predef/os/linux.h b/include/boost/predef/os/linux.h
similarity index 100%
rename from boost/predef/os/linux.h
rename to include/boost/predef/os/linux.h
diff --git a/boost/predef/os/macos.h b/include/boost/predef/os/macos.h
similarity index 100%
rename from boost/predef/os/macos.h
rename to include/boost/predef/os/macos.h
diff --git a/boost/predef/os/os400.h b/include/boost/predef/os/os400.h
similarity index 100%
rename from boost/predef/os/os400.h
rename to include/boost/predef/os/os400.h
diff --git a/boost/predef/os/qnxnto.h b/include/boost/predef/os/qnxnto.h
similarity index 100%
rename from boost/predef/os/qnxnto.h
rename to include/boost/predef/os/qnxnto.h
diff --git a/boost/predef/os/solaris.h b/include/boost/predef/os/solaris.h
similarity index 100%
rename from boost/predef/os/solaris.h
rename to include/boost/predef/os/solaris.h
diff --git a/boost/predef/os/unix.h b/include/boost/predef/os/unix.h
similarity index 100%
rename from boost/predef/os/unix.h
rename to include/boost/predef/os/unix.h
diff --git a/boost/predef/os/vms.h b/include/boost/predef/os/vms.h
similarity index 100%
rename from boost/predef/os/vms.h
rename to include/boost/predef/os/vms.h
diff --git a/boost/predef/os/windows.h b/include/boost/predef/os/windows.h
similarity index 100%
rename from boost/predef/os/windows.h
rename to include/boost/predef/os/windows.h
diff --git a/boost/predef/version_number.h b/include/boost/predef/version_number.h
similarity index 100%
rename from boost/predef/version_number.h
rename to include/boost/predef/version_number.h
diff --git a/libs/predef/test/build.jam b/test/build.jam
similarity index 84%
rename from libs/predef/test/build.jam
rename to test/build.jam
index 6dcbd1d..c791ed8 100644
--- a/libs/predef/test/build.jam
+++ b/test/build.jam
@@ -5,8 +5,8 @@
 
 project test
     :   requirements
-        <include>$(BOOST_PREDEF_ROOT)
-        <dependency>$(BOOST_PREDEF_ROOT)/boost/predef.h
+        <include>$(BOOST_PREDEF_ROOT)/include
+        <dependency>$(BOOST_PREDEF_ROOT)/include/boost/predef.h
     ;
 
 using testing ;
diff --git a/libs/predef/test/info_as_c.c b/test/info_as_c.c
similarity index 100%
rename from libs/predef/test/info_as_c.c
rename to test/info_as_c.c
diff --git a/libs/predef/test/info_as_cpp.cpp b/test/info_as_cpp.cpp
similarity index 100%
rename from libs/predef/test/info_as_cpp.cpp
rename to test/info_as_cpp.cpp
diff --git a/libs/predef/test/info_as_objc.m b/test/info_as_objc.m
similarity index 100%
rename from libs/predef/test/info_as_objc.m
rename to test/info_as_objc.m
diff --git a/libs/predef/test/info_as_objcpp.mm b/test/info_as_objcpp.mm
similarity index 100%
rename from libs/predef/test/info_as_objcpp.mm
rename to test/info_as_objcpp.mm
diff --git a/libs/predef/test/make.cpp b/test/make.cpp
similarity index 100%
rename from libs/predef/test/make.cpp
rename to test/make.cpp
diff --git a/libs/predef/test/version.cpp b/test/version.cpp
similarity index 100%
rename from libs/predef/test/version.cpp
rename to test/version.cpp