diff --git a/example/cpp03/Jamfile.v2 b/example/cpp03/asymmetric/Jamfile.v2
similarity index 71%
rename from example/cpp03/Jamfile.v2
rename to example/cpp03/asymmetric/Jamfile.v2
index 4bc4880..8a3c609 100644
--- a/example/cpp03/Jamfile.v2
+++ b/example/cpp03/asymmetric/Jamfile.v2
@@ -16,7 +16,7 @@ import toolset ;
 
 project boost/coroutine/example
     : requirements
-      <library>../../build//boost_coroutine
+      <library>../../../build//boost_coroutine
       <library>/boost/program_options//boost_program_options
       <library>/boost/thread//boost_thread
       <toolset>gcc-4.7,<segmented-stacks>on:<cxxflags>-fsplit-stack
@@ -32,3 +32,33 @@ project boost/coroutine/example
 exe simple
     : simple.cpp
     ;
+exe chaining
+    : chaining.cpp
+    ;
+exe echo
+    : echo.cpp
+    ;
+exe exception
+    : exception.cpp
+    ;
+exe fibonacci
+    : fibonacci.cpp
+    ;
+exe layout
+    : layout.cpp
+    ;
+exe parallel
+    : parallel.cpp
+    ;
+exe power
+    : power.cpp
+    ;
+exe same_fringe
+    : same_fringe.cpp
+    ;
+exe segmented_stack
+    : segmented_stack.cpp
+    ;
+exe unwind
+    : unwind.cpp
+    ;
diff --git a/example/cpp03/chaining.cpp b/example/cpp03/asymmetric/chaining.cpp
similarity index 100%
rename from example/cpp03/chaining.cpp
rename to example/cpp03/asymmetric/chaining.cpp
diff --git a/example/cpp03/echo.cpp b/example/cpp03/asymmetric/echo.cpp
similarity index 100%
rename from example/cpp03/echo.cpp
rename to example/cpp03/asymmetric/echo.cpp
diff --git a/example/cpp03/exception.cpp b/example/cpp03/asymmetric/exception.cpp
similarity index 100%
rename from example/cpp03/exception.cpp
rename to example/cpp03/asymmetric/exception.cpp
diff --git a/example/cpp03/fibonacci.cpp b/example/cpp03/asymmetric/fibonacci.cpp
similarity index 100%
rename from example/cpp03/fibonacci.cpp
rename to example/cpp03/asymmetric/fibonacci.cpp
diff --git a/example/cpp03/layout.cpp b/example/cpp03/asymmetric/layout.cpp
similarity index 100%
rename from example/cpp03/layout.cpp
rename to example/cpp03/asymmetric/layout.cpp
diff --git a/example/cpp03/parallel.cpp b/example/cpp03/asymmetric/parallel.cpp
similarity index 100%
rename from example/cpp03/parallel.cpp
rename to example/cpp03/asymmetric/parallel.cpp
diff --git a/example/cpp03/power.cpp b/example/cpp03/asymmetric/power.cpp
similarity index 100%
rename from example/cpp03/power.cpp
rename to example/cpp03/asymmetric/power.cpp
diff --git a/example/cpp03/same_fringe.cpp b/example/cpp03/asymmetric/same_fringe.cpp
similarity index 100%
rename from example/cpp03/same_fringe.cpp
rename to example/cpp03/asymmetric/same_fringe.cpp
diff --git a/example/cpp03/segmented_stack.cpp b/example/cpp03/asymmetric/segmented_stack.cpp
similarity index 100%
rename from example/cpp03/segmented_stack.cpp
rename to example/cpp03/asymmetric/segmented_stack.cpp
diff --git a/example/cpp03/simple.cpp b/example/cpp03/asymmetric/simple.cpp
similarity index 100%
rename from example/cpp03/simple.cpp
rename to example/cpp03/asymmetric/simple.cpp
diff --git a/example/cpp03/tree.h b/example/cpp03/asymmetric/tree.h
similarity index 100%
rename from example/cpp03/tree.h
rename to example/cpp03/asymmetric/tree.h
diff --git a/example/cpp03/unwind.cpp b/example/cpp03/asymmetric/unwind.cpp
similarity index 100%
rename from example/cpp03/unwind.cpp
rename to example/cpp03/asymmetric/unwind.cpp
diff --git a/example/cpp11/Jamfile.v2 b/example/cpp11/asymmetric/Jamfile.v2
similarity index 85%
rename from example/cpp11/Jamfile.v2
rename to example/cpp11/asymmetric/Jamfile.v2
index aff2101..2900897 100644
--- a/example/cpp11/Jamfile.v2
+++ b/example/cpp11/asymmetric/Jamfile.v2
@@ -14,24 +14,9 @@ import modules ;
 import os ;
 import toolset ;
 
-if [ os.name ] = SOLARIS
-{
-  lib socket ;
-  lib nsl ;
-}
-else if [ os.name ] = NT
-{
-  lib ws2_32 ;
-  lib mswsock ;
-}
-else if [ os.name ] = HPUX
-{
-  lib ipv6 ;
-}
-
 project boost/coroutine/example
     : requirements
-      <library>../../build//boost_coroutine
+      <library>../../../build//boost_coroutine
       <library>/boost/program_options//boost_program_options
       <library>/boost/thread//boost_thread
       <toolset>gcc-4.7,<segmented-stacks>on:<cxxflags>-fsplit-stack
diff --git a/example/cpp11/await_emu.cpp b/example/cpp11/asymmetric/await_emu.cpp
similarity index 100%
rename from example/cpp11/await_emu.cpp
rename to example/cpp11/asymmetric/await_emu.cpp
diff --git a/example/cpp11/fibonacci.cpp b/example/cpp11/asymmetric/fibonacci.cpp
similarity index 100%
rename from example/cpp11/fibonacci.cpp
rename to example/cpp11/asymmetric/fibonacci.cpp
diff --git a/example/cpp11/layout.cpp b/example/cpp11/asymmetric/layout.cpp
similarity index 100%
rename from example/cpp11/layout.cpp
rename to example/cpp11/asymmetric/layout.cpp
diff --git a/example/cpp11/same_fringe.cpp b/example/cpp11/asymmetric/same_fringe.cpp
similarity index 100%
rename from example/cpp11/same_fringe.cpp
rename to example/cpp11/asymmetric/same_fringe.cpp
diff --git a/example/cpp11/tree.h b/example/cpp11/asymmetric/tree.h
similarity index 100%
rename from example/cpp11/tree.h
rename to example/cpp11/asymmetric/tree.h
diff --git a/include/boost/coroutine/coroutine.hpp b/include/boost/coroutine/coroutine.hpp
index 7391aff..5782c41 100644
--- a/include/boost/coroutine/coroutine.hpp
+++ b/include/boost/coroutine/coroutine.hpp
@@ -8,7 +8,7 @@
 #define BOOST_COROUTINES_COROUTINE_H
 
 #include <boost/coroutine/asymmetric_coroutine.hpp>
-#include <boost/coroutine/symmetric_coroutine.hpp>
+//#include <boost/coroutine/symmetric_coroutine.hpp>
 
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_SUFFIX
diff --git a/performance/Jamfile.v2 b/performance/asymmetric/Jamfile.v2
similarity index 83%
rename from performance/Jamfile.v2
rename to performance/asymmetric/Jamfile.v2
index bc1c9e1..07cd112 100644
--- a/performance/Jamfile.v2
+++ b/performance/asymmetric/Jamfile.v2
@@ -13,7 +13,7 @@ import modules ;
 import os ;
 import toolset ;
 
-project boost/coroutine/performance
+project boost/coroutine/performance/asymmetric
     : requirements
       <library>/boost/chrono//boost_chrono
       <library>/boost/coroutine//boost_coroutine
@@ -24,32 +24,32 @@ project boost/coroutine/performance
     ;
 
 alias sources
-   : bind_processor_aix.cpp
+   : ../bind_processor_aix.cpp
    : <target-os>aix
    ;
 
 alias sources
-   : bind_processor_freebsd.cpp
+   : ../bind_processor_freebsd.cpp
    : <target-os>freebsd
    ;
 
 alias sources
-   : bind_processor_hpux.cpp
+   : ../bind_processor_hpux.cpp
    : <target-os>hpux
    ;
 
 alias sources
-   : bind_processor_linux.cpp
+   : ../bind_processor_linux.cpp
    : <target-os>linux
    ;
 
 alias sources
-   : bind_processor_solaris.cpp
+   : ../bind_processor_solaris.cpp
    : <target-os>solaris
    ;
 
 alias sources
-   : bind_processor_windows.cpp
+   : ../bind_processor_windows.cpp
    : <target-os>windows
    ;
 
diff --git a/performance/performance_create_prealloc.cpp b/performance/asymmetric/performance_create_prealloc.cpp
similarity index 96%
rename from performance/performance_create_prealloc.cpp
rename to performance/asymmetric/performance_create_prealloc.cpp
index f8210dd..b2118ee 100644
--- a/performance/performance_create_prealloc.cpp
+++ b/performance/asymmetric/performance_create_prealloc.cpp
@@ -13,10 +13,10 @@
 #include <boost/cstdint.hpp>
 #include <boost/program_options.hpp>
 
-#include "bind_processor.hpp"
-#include "clock.hpp"
-#include "cycle.hpp"
-#include "preallocated_stack_allocator.hpp"
+#include "../bind_processor.hpp"
+#include "../clock.hpp"
+#include "../cycle.hpp"
+#include "../preallocated_stack_allocator.hpp"
 
 typedef preallocated_stack_allocator                            stack_allocator;
 typedef boost::coroutines::coroutine< void, stack_allocator >   coro_type;
diff --git a/performance/performance_create_protected.cpp b/performance/asymmetric/performance_create_protected.cpp
similarity index 97%
rename from performance/performance_create_protected.cpp
rename to performance/asymmetric/performance_create_protected.cpp
index 5498a53..ed7ebc9 100644
--- a/performance/performance_create_protected.cpp
+++ b/performance/asymmetric/performance_create_protected.cpp
@@ -13,9 +13,9 @@
 #include <boost/cstdint.hpp>
 #include <boost/program_options.hpp>
 
-#include "bind_processor.hpp"
-#include "clock.hpp"
-#include "cycle.hpp"
+#include "../bind_processor.hpp"
+#include "../clock.hpp"
+#include "../cycle.hpp"
 
 typedef boost::coroutines::protected_stack_allocator            stack_allocator;
 typedef boost::coroutines::coroutine< void, stack_allocator >   coro_type;
diff --git a/performance/performance_create_standard.cpp b/performance/asymmetric/performance_create_standard.cpp
similarity index 97%
rename from performance/performance_create_standard.cpp
rename to performance/asymmetric/performance_create_standard.cpp
index 61952da..0e60d02 100644
--- a/performance/performance_create_standard.cpp
+++ b/performance/asymmetric/performance_create_standard.cpp
@@ -13,9 +13,9 @@
 #include <boost/cstdint.hpp>
 #include <boost/program_options.hpp>
 
-#include "bind_processor.hpp"
-#include "clock.hpp"
-#include "cycle.hpp"
+#include "../bind_processor.hpp"
+#include "../clock.hpp"
+#include "../cycle.hpp"
 
 typedef boost::coroutines::standard_stack_allocator   stack_allocator;
 typedef boost::coroutines::coroutine< void, stack_allocator >   coro_type;
diff --git a/performance/performance_switch.cpp b/performance/asymmetric/performance_switch.cpp
similarity index 98%
rename from performance/performance_switch.cpp
rename to performance/asymmetric/performance_switch.cpp
index 92a2a9d..f53842f 100644
--- a/performance/performance_switch.cpp
+++ b/performance/asymmetric/performance_switch.cpp
@@ -14,9 +14,9 @@
 #include <boost/cstdint.hpp>
 #include <boost/program_options.hpp>
 
-#include "bind_processor.hpp"
-#include "clock.hpp"
-#include "cycle.hpp"
+#include "../bind_processor.hpp"
+#include "../clock.hpp"
+#include "../cycle.hpp"
 
 boost::coroutines::flag_fpu_t preserve_fpu = boost::coroutines::fpu_not_preserved;
 boost::uint64_t jobs = 1000;
diff --git a/performance/segmented/Jamfile.v2 b/performance/asymmetric/segmented/Jamfile.v2
similarity index 87%
rename from performance/segmented/Jamfile.v2
rename to performance/asymmetric/segmented/Jamfile.v2
index 7cad210..3ac0336 100644
--- a/performance/segmented/Jamfile.v2
+++ b/performance/asymmetric/segmented/Jamfile.v2
@@ -30,32 +30,32 @@ project boost/coroutine/performance/segmented
     ;
 
 alias sources
-   : ../bind_processor_aix.cpp
+   : ../../bind_processor_aix.cpp
    : <target-os>aix
    ;
 
 alias sources
-   : ../bind_processor_freebsd.cpp
+   : ../../bind_processor_freebsd.cpp
    : <target-os>freebsd
    ;
 
 alias sources
-   : ../bind_processor_hpux.cpp
+   : ../../bind_processor_hpux.cpp
    : <target-os>hpux
    ;
 
 alias sources
-   : ../bind_processor_linux.cpp
+   : ../../bind_processor_linux.cpp
    : <target-os>linux
    ;
 
 alias sources
-   : ../bind_processor_solaris.cpp
+   : ../../bind_processor_solaris.cpp
    : <target-os>solaris
    ;
 
 alias sources
-   : ../bind_processor_windows.cpp
+   : ../../bind_processor_windows.cpp
    : <target-os>windows
    ;
 
diff --git a/performance/segmented/performance_create_segmented.cpp b/performance/asymmetric/segmented/performance_create_segmented.cpp
similarity index 97%
rename from performance/segmented/performance_create_segmented.cpp
rename to performance/asymmetric/segmented/performance_create_segmented.cpp
index b7db646..a068f42 100644
--- a/performance/segmented/performance_create_segmented.cpp
+++ b/performance/asymmetric/segmented/performance_create_segmented.cpp
@@ -13,9 +13,9 @@
 #include <boost/cstdint.hpp>
 #include <boost/program_options.hpp>
 
-#include "../bind_processor.hpp"
-#include "../clock.hpp"
-#include "../cycle.hpp"
+#include "../../bind_processor.hpp"
+#include "../../clock.hpp"
+#include "../../cycle.hpp"
 
 boost::coroutines::flag_fpu_t preserve_fpu = boost::coroutines::fpu_not_preserved;
 boost::uint64_t jobs = 1000;
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 631e690..c2374b7 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -27,5 +27,5 @@ project boost/coroutine/test
     ;
 
 test-suite "coroutine" :
-    [ run test_coroutine.cpp ]
+    [ run test_asymmetric_coroutine.cpp ]
     ;
diff --git a/test/test_coroutine.cpp b/test/test_asymmetric_coroutine.cpp
similarity index 100%
rename from test/test_coroutine.cpp
rename to test/test_asymmetric_coroutine.cpp