diff --git a/generator_iterator.htm b/doc/generator_iterator.htm
similarity index 100%
rename from generator_iterator.htm
rename to doc/generator_iterator.htm
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 023a826..739fdc7 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -44,5 +44,6 @@ test-suite iterator
     [ run permutation_iterator_test.cpp : : : # <stlport-iostream>on 
     ]
     [ run function_input_iterator_test.cpp ]
-      
+    [ run generator_iterator_test.cpp ]
+
 ;
diff --git a/generator_iterator_test.cpp b/test/generator_iterator_test.cpp
similarity index 100%
rename from generator_iterator_test.cpp
rename to test/generator_iterator_test.cpp