diff --git a/scheme/Makefile.am b/scheme/Makefile.am
index 056fa85..055b7a7 100644
--- a/scheme/Makefile.am
+++ b/scheme/Makefile.am
@@ -22,9 +22,8 @@ EXTRA_DIST=ikarus.boot.prebuilt ikarus.enumerations.ss \
   pass-specify-rep-primops.ss pass-specify-rep.ss psyntax.builders.ss \
   psyntax.compat.ss psyntax.config.ss psyntax.expander.ss \
   psyntax.internal.ss psyntax.library-manager.ss \
-  ikarus/code-objects.ss ikarus/compiler.ss ikarus/intel-assembler.ss \
-  ikarus/fasl/write.ss unicode/unicode-char-cases.ss \
-  unicode/unicode-charinfo.ss ikarus.io.ss ikarus.time-and-date.ss 
+  unicode/unicode-char-cases.ss unicode/unicode-charinfo.ss \
+  ikarus.io.ss ikarus.time-and-date.ss 
  
 all: $(nodist_pkglib_DATA)
 
diff --git a/scheme/Makefile.in b/scheme/Makefile.in
index 28ad9cc..9106662 100644
--- a/scheme/Makefile.in
+++ b/scheme/Makefile.in
@@ -176,9 +176,8 @@ EXTRA_DIST = ikarus.boot.prebuilt ikarus.enumerations.ss \
   pass-specify-rep-primops.ss pass-specify-rep.ss psyntax.builders.ss \
   psyntax.compat.ss psyntax.config.ss psyntax.expander.ss \
   psyntax.internal.ss psyntax.library-manager.ss \
-  ikarus/code-objects.ss ikarus/compiler.ss ikarus/intel-assembler.ss \
-  ikarus/fasl/write.ss unicode/unicode-char-cases.ss \
-  unicode/unicode-charinfo.ss ikarus.io.ss ikarus.time-and-date.ss 
+  unicode/unicode-char-cases.ss unicode/unicode-charinfo.ss \
+  ikarus.io.ss ikarus.time-and-date.ss 
 
 revno = "$(shell sed 's/ .*//' ../.bzr/branch/last-revision 2>/dev/null)"
 CLEANFILES = $(nodist_pkglib_DATA) ikarus.config.ss
diff --git a/scheme/ikarus.boot.prebuilt b/scheme/ikarus.boot.prebuilt
index ca8a866..21a24aa 100644
Binary files a/scheme/ikarus.boot.prebuilt and b/scheme/ikarus.boot.prebuilt differ
diff --git a/scheme/ikarus.code-objects.ss b/scheme/ikarus.code-objects.ss
index 64fb21f..ae2649e 100644
--- a/scheme/ikarus.code-objects.ss
+++ b/scheme/ikarus.code-objects.ss
@@ -14,7 +14,7 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(library (ikarus code-objects)
+(library (ikarus.code-objects)
   (export
     make-code code-reloc-vector code-freevars
     code-size code-ref code-set! set-code-reloc-vector!
diff --git a/scheme/ikarus.compiler.ss b/scheme/ikarus.compiler.ss
index a808ff1..ce4cfda 100644
--- a/scheme/ikarus.compiler.ss
+++ b/scheme/ikarus.compiler.ss
@@ -14,7 +14,7 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(library (ikarus compiler)
+(library (ikarus.compiler)
   (export compile-core-expr-to-port 
           assembler-output scc-letrec optimize-cp
           current-primitive-locations eval-core)
@@ -28,8 +28,8 @@
         fasl-write scc-letrec optimize-cp
         compile-core-expr-to-port assembler-output
         current-primitive-locations eval-core)
-    (ikarus fasl write)
-    (ikarus intel-assembler))
+    (ikarus.fasl.write)
+    (ikarus.intel-assembler))
 
 
 (define-syntax struct-case
diff --git a/scheme/ikarus.fasl.ss b/scheme/ikarus.fasl.ss
index d5d5053..a75ddbd 100644
--- a/scheme/ikarus.fasl.ss
+++ b/scheme/ikarus.fasl.ss
@@ -56,7 +56,7 @@
 (library (ikarus fasl read)
   (export fasl-read)
   (import (ikarus)
-          (except (ikarus code-objects) procedure-annotation)
+          (except (ikarus.code-objects) procedure-annotation)
           (ikarus system $codes)
           (ikarus system $structs))
 
diff --git a/scheme/ikarus.fasl.write.ss b/scheme/ikarus.fasl.write.ss
index 3a5260d..6408e69 100644
--- a/scheme/ikarus.fasl.write.ss
+++ b/scheme/ikarus.fasl.write.ss
@@ -14,7 +14,7 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(library (ikarus fasl write)
+(library (ikarus.fasl.write)
   (export fasl-write)
   (import
     (rnrs hashtables)
@@ -27,7 +27,7 @@
     (ikarus system $strings)
     (ikarus system $flonums)
     (ikarus system $bignums)
-    (except (ikarus code-objects) procedure-annotation)
+    (except (ikarus.code-objects) procedure-annotation)
     (except (ikarus) fasl-write write-byte))
  
   (module (wordsize)
diff --git a/scheme/ikarus.intel-assembler.ss b/scheme/ikarus.intel-assembler.ss
index 4a2b8ae..08a724b 100644
--- a/scheme/ikarus.intel-assembler.ss
+++ b/scheme/ikarus.intel-assembler.ss
@@ -15,12 +15,12 @@
 
 
 
-(library (ikarus intel-assembler)
+(library (ikarus.intel-assembler)
   (export instruction-size assemble-sources code-entry-adjustment)
   (import 
     (ikarus)
     (rnrs bytevectors)
-    (except (ikarus code-objects) procedure-annotation)
+    (except (ikarus.code-objects) procedure-annotation)
     (ikarus system $pairs))
 
 
diff --git a/scheme/ikarus/code-objects.ss b/scheme/ikarus/code-objects.ss
deleted file mode 120000
index 9b3501c..0000000
--- a/scheme/ikarus/code-objects.ss
+++ /dev/null
@@ -1 +0,0 @@
-../ikarus.code-objects.ss
\ No newline at end of file
diff --git a/scheme/ikarus/compiler.ss b/scheme/ikarus/compiler.ss
deleted file mode 120000
index f3c8c03..0000000
--- a/scheme/ikarus/compiler.ss
+++ /dev/null
@@ -1 +0,0 @@
-../ikarus.compiler.ss
\ No newline at end of file
diff --git a/scheme/ikarus/fasl/write.ss b/scheme/ikarus/fasl/write.ss
deleted file mode 120000
index f233363..0000000
--- a/scheme/ikarus/fasl/write.ss
+++ /dev/null
@@ -1 +0,0 @@
-../../ikarus.fasl.write.ss
\ No newline at end of file
diff --git a/scheme/ikarus/intel-assembler.ss b/scheme/ikarus/intel-assembler.ss
deleted file mode 120000
index 084efd9..0000000
--- a/scheme/ikarus/intel-assembler.ss
+++ /dev/null
@@ -1 +0,0 @@
-../ikarus.intel-assembler.ss
\ No newline at end of file
diff --git a/scheme/last-revision b/scheme/last-revision
index 6ee2947..7a1ed49 100644
--- a/scheme/last-revision
+++ b/scheme/last-revision
@@ -1 +1 @@
-1384
+1385
diff --git a/scheme/makefile.ss b/scheme/makefile.ss
index 8b0024c..49a714f 100755
--- a/scheme/makefile.ss
+++ b/scheme/makefile.ss
@@ -17,12 +17,12 @@
 ;;; vim:syntax=scheme
 (import (only (ikarus) import))
 (import (except (ikarus) assembler-output scc-letrec optimize-cp))
-(import (ikarus compiler))
+(import (ikarus.compiler))
 (import (except (psyntax system $bootstrap)
                 eval-core 
                 current-primitive-locations
                 compile-core-expr-to-port))
-(import (ikarus compiler)) ; just for fun
+(import (ikarus.compiler)) ; just for fun
 
 (define scheme-library-files
   ;;; Listed in the order in which they're loaded.
@@ -1542,7 +1542,7 @@
                   (import 
                     (only (psyntax library-manager)
                           install-library)
-                    (only (ikarus compiler)
+                    (only (ikarus.compiler)
                           current-primitive-locations)
                     (ikarus))
                   (current-primitive-locations 
diff --git a/scheme/psyntax.compat.ss b/scheme/psyntax.compat.ss
index a4d0e0c..ab3630f 100644
--- a/scheme/psyntax.compat.ss
+++ b/scheme/psyntax.compat.ss
@@ -21,7 +21,7 @@
           annotation? annotation-expression annotation-source
           annotation-stripped)
   (import 
-    (only (ikarus compiler) eval-core)
+    (only (ikarus.compiler) eval-core)
     (ikarus))
 
   (define-syntax define-record
diff --git a/scheme/psyntax.internal.ss b/scheme/psyntax.internal.ss
index b7b2bd5..ed5dc21 100644
--- a/scheme/psyntax.internal.ss
+++ b/scheme/psyntax.internal.ss
@@ -20,7 +20,7 @@
 
 (library (psyntax internal)
   (export current-primitive-locations compile-core-expr-to-port expanded->core)
-  (import (rnrs) (psyntax compat) (ikarus compiler))
+  (import (rnrs) (psyntax compat) (ikarus.compiler))
   
   (define (expanded->core x) x))