diff --git a/contrib/05.r7rs/CMakeLists.txt b/contrib/05.r7rs/CMakeLists.txt
new file mode 100644
index 00000000..814d80c2
--- /dev/null
+++ b/contrib/05.r7rs/CMakeLists.txt
@@ -0,0 +1,15 @@
+list(APPEND PICLIB_SCHEME_LIBS
+  ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/base.scm
+  ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/cxr.scm
+  ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/read.scm
+  ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/write.scm
+  ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/file.scm
+  ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/case-lambda.scm
+  ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/lazy.scm
+  ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/eval.scm
+  ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/inexact.scm
+  ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/load.scm
+  ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/process-context.scm
+  ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/time.scm
+  ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/r5rs.scm
+  )
diff --git a/contrib/05.scheme/scheme/base.scm b/contrib/05.r7rs/scheme/base.scm
similarity index 100%
rename from contrib/05.scheme/scheme/base.scm
rename to contrib/05.r7rs/scheme/base.scm
diff --git a/contrib/05.scheme/scheme/case-lambda.scm b/contrib/05.r7rs/scheme/case-lambda.scm
similarity index 100%
rename from contrib/05.scheme/scheme/case-lambda.scm
rename to contrib/05.r7rs/scheme/case-lambda.scm
diff --git a/contrib/05.scheme/scheme/cxr.scm b/contrib/05.r7rs/scheme/cxr.scm
similarity index 100%
rename from contrib/05.scheme/scheme/cxr.scm
rename to contrib/05.r7rs/scheme/cxr.scm
diff --git a/contrib/05.scheme/scheme/eval.scm b/contrib/05.r7rs/scheme/eval.scm
similarity index 100%
rename from contrib/05.scheme/scheme/eval.scm
rename to contrib/05.r7rs/scheme/eval.scm
diff --git a/contrib/05.scheme/scheme/file.scm b/contrib/05.r7rs/scheme/file.scm
similarity index 100%
rename from contrib/05.scheme/scheme/file.scm
rename to contrib/05.r7rs/scheme/file.scm
diff --git a/contrib/05.scheme/scheme/inexact.scm b/contrib/05.r7rs/scheme/inexact.scm
similarity index 100%
rename from contrib/05.scheme/scheme/inexact.scm
rename to contrib/05.r7rs/scheme/inexact.scm
diff --git a/contrib/05.scheme/scheme/lazy.scm b/contrib/05.r7rs/scheme/lazy.scm
similarity index 100%
rename from contrib/05.scheme/scheme/lazy.scm
rename to contrib/05.r7rs/scheme/lazy.scm
diff --git a/contrib/05.scheme/scheme/load.scm b/contrib/05.r7rs/scheme/load.scm
similarity index 100%
rename from contrib/05.scheme/scheme/load.scm
rename to contrib/05.r7rs/scheme/load.scm
diff --git a/contrib/05.scheme/scheme/process-context.scm b/contrib/05.r7rs/scheme/process-context.scm
similarity index 100%
rename from contrib/05.scheme/scheme/process-context.scm
rename to contrib/05.r7rs/scheme/process-context.scm
diff --git a/contrib/05.scheme/scheme/r5rs.scm b/contrib/05.r7rs/scheme/r5rs.scm
similarity index 100%
rename from contrib/05.scheme/scheme/r5rs.scm
rename to contrib/05.r7rs/scheme/r5rs.scm
diff --git a/contrib/05.scheme/scheme/read.scm b/contrib/05.r7rs/scheme/read.scm
similarity index 100%
rename from contrib/05.scheme/scheme/read.scm
rename to contrib/05.r7rs/scheme/read.scm
diff --git a/contrib/05.scheme/scheme/time.scm b/contrib/05.r7rs/scheme/time.scm
similarity index 100%
rename from contrib/05.scheme/scheme/time.scm
rename to contrib/05.r7rs/scheme/time.scm
diff --git a/contrib/05.scheme/scheme/write.scm b/contrib/05.r7rs/scheme/write.scm
similarity index 100%
rename from contrib/05.scheme/scheme/write.scm
rename to contrib/05.r7rs/scheme/write.scm
diff --git a/contrib/05.scheme/CMakeLists.txt b/contrib/05.scheme/CMakeLists.txt
deleted file mode 100644
index 16575ae9..00000000
--- a/contrib/05.scheme/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-list(APPEND PICLIB_SCHEME_LIBS
-  ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/base.scm
-  ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/cxr.scm
-  ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/read.scm
-  ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/write.scm
-  ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/file.scm
-  ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/case-lambda.scm
-  ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/lazy.scm
-  ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/eval.scm
-  ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/inexact.scm
-  ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/load.scm
-  ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/process-context.scm
-  ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/time.scm
-  ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/r5rs.scm
-  )