diff --git a/python2/koans/about_asserts.py b/python2/koans/about_asserts.py
index 61b53ada1..cf5962f22 100644
--- a/python2/koans/about_asserts.py
+++ b/python2/koans/about_asserts.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from runner.koan import *
+from koan import *
 
 
 class AboutAsserts(Koan):
@@ -62,13 +62,14 @@ def test_that_sometimes_we_need_to_know_the_class_type(self):
 
         # Sometimes we will ask you what the class type of an object is.
         #
-        # For example, contemplate the text string "naval". What is it's class type?
+        # For example, contemplate the text string "naval". 
+        # What is it's class type?
         # The koans runner will include this feedback for this koan:
         #
         #   AssertionError: '-=> FILL ME IN! <=-' != <type 'str'>
         #
-        # So "naval".__class__ is equal to <type 'str'>? No not quite. This
-        # is just what it displays. The answer is simply str.
+        # So "naval".__class__ is equal to <type 'str'>? No not quite. 
+        # This is just what it displays. The answer is simply str.
         #
         # See for yourself:
 
diff --git a/python2/runner/__init__.py b/python2/koans/runner/__init__.py
similarity index 100%
rename from python2/runner/__init__.py
rename to python2/koans/runner/__init__.py
diff --git a/python2/runner/helper.py b/python2/koans/runner/helper.py
similarity index 100%
rename from python2/runner/helper.py
rename to python2/koans/runner/helper.py
diff --git a/python2/runner/koan.py b/python2/koans/runner/koan.py
similarity index 100%
rename from python2/runner/koan.py
rename to python2/koans/runner/koan.py
diff --git a/python2/runner/mockable_test_result.py b/python2/koans/runner/mockable_test_result.py
similarity index 100%
rename from python2/runner/mockable_test_result.py
rename to python2/koans/runner/mockable_test_result.py
diff --git a/python2/runner/mountain.py b/python2/koans/runner/mountain.py
similarity index 100%
rename from python2/runner/mountain.py
rename to python2/koans/runner/mountain.py
diff --git a/python2/runner/path_to_enlightenment.py b/python2/koans/runner/path_to_enlightenment.py
similarity index 100%
rename from python2/runner/path_to_enlightenment.py
rename to python2/koans/runner/path_to_enlightenment.py
diff --git a/python2/runner/runner_tests/__init__.py b/python2/koans/runner/runner_tests/__init__.py
similarity index 100%
rename from python2/runner/runner_tests/__init__.py
rename to python2/koans/runner/runner_tests/__init__.py
diff --git a/python2/runner/runner_tests/test_helper.py b/python2/koans/runner/runner_tests/test_helper.py
similarity index 100%
rename from python2/runner/runner_tests/test_helper.py
rename to python2/koans/runner/runner_tests/test_helper.py
diff --git a/python2/runner/runner_tests/test_mountain.py b/python2/koans/runner/runner_tests/test_mountain.py
similarity index 100%
rename from python2/runner/runner_tests/test_mountain.py
rename to python2/koans/runner/runner_tests/test_mountain.py
diff --git a/python2/runner/runner_tests/test_sensei.py b/python2/koans/runner/runner_tests/test_sensei.py
similarity index 100%
rename from python2/runner/runner_tests/test_sensei.py
rename to python2/koans/runner/runner_tests/test_sensei.py
diff --git a/python2/runner/sensei.py b/python2/koans/runner/sensei.py
similarity index 100%
rename from python2/runner/sensei.py
rename to python2/koans/runner/sensei.py
diff --git a/python2/runner/writeln_decorator.py b/python2/koans/runner/writeln_decorator.py
similarity index 100%
rename from python2/runner/writeln_decorator.py
rename to python2/koans/runner/writeln_decorator.py