diff --git a/Makefile.in b/Makefile.in
index 0a870c84f..979521bcf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -590,7 +590,7 @@ mycb: $(srcdir)/mycb.c
 	$(CC) $(CFLAGS) $(srcdir)/mycb.c -o mycb
 
 all: startup
-	(cd LGPL/PLStream; $(MAKE))
+	(cd packages/PLStream; $(MAKE))
 	@INSTALL_DLLS@ (cd library/random; $(MAKE))
 	@INSTALL_DLLS@ (cd library/regex; $(MAKE))
 	@INSTALL_DLLS@ (cd library/rltree; $(MAKE))
diff --git a/configure b/configure
index 8d9fe160f..9fa90ea23 100755
--- a/configure
+++ b/configure
@@ -16295,7 +16295,7 @@ mkdir -p  library/lammpi
 mkdir -p  library/yap2swi
 mkdir -p  CHR
 mkdir -p  CLPQR
-mkdir -p  CLPBN
+mkdir -p  packages/CLPBN
 mkdir -p  LGPL
 mkdir -p  LGPL/JPL
 mkdir -p  LGPL/JPL/java
@@ -16304,15 +16304,15 @@ mkdir -p  LGPL/JPL/java/jpl/fli
 mkdir -p  LGPL/JPL/java/jpl/test
 mkdir -p  LGPL/JPL/src
 mkdir -p  LGPL/clp
-mkdir -p  LGPL/chr
+mkdir -p  packages/chr
 mkdir -p  LGPL/swi_console
-mkdir -p  LGPL/PLStream
+mkdir -p  packages/PLStream
 mkdir -p  GPL
 mkdir -p  GPL/clpqr
 mkdir -p  GPL/http
-mkdir -p  cplint
+mkdir -p  packages/cplint
 
-ac_config_files="$ac_config_files Makefile library/matrix/Makefile library/matlab/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/Makefile LGPL/chr/Makefile CLPBN/Makefile LGPL/clp/Makefile GPL/clpqr/Makefile library/lammpi/Makefile library/tries/Makefile library/rltree/Makefile LGPL/swi_console/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap GPL/http/Makefile GPL/Makefile cplint/Makefile LGPL/PLStream/Makefile"
+ac_config_files="$ac_config_files Makefile library/matrix/Makefile library/matlab/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/Makefile packages/chr/Makefile packages/CLPBN/Makefile LGPL/clp/Makefile GPL/clpqr/Makefile library/lammpi/Makefile library/tries/Makefile library/rltree/Makefile LGPL/swi_console/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap GPL/http/Makefile GPL/Makefile pakcgaes/cplint/Makefile LGPL/PLStream/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -16879,8 +16879,8 @@ do
     ".depend") CONFIG_FILES="$CONFIG_FILES .depend" ;;
     "library/Makefile") CONFIG_FILES="$CONFIG_FILES library/Makefile" ;;
     "LGPL/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/Makefile" ;;
-    "LGPL/chr/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/chr/Makefile" ;;
-    "CLPBN/Makefile") CONFIG_FILES="$CONFIG_FILES CLPBN/Makefile" ;;
+    "packages/chr/Makefile") CONFIG_FILES="$CONFIG_FILES packages/chr/Makefile" ;;
+    "packages/CLPBN/Makefile") CONFIG_FILES="$CONFIG_FILES packages/CLPBN/Makefile" ;;
     "LGPL/clp/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/clp/Makefile" ;;
     "GPL/clpqr/Makefile") CONFIG_FILES="$CONFIG_FILES GPL/clpqr/Makefile" ;;
     "library/lammpi/Makefile") CONFIG_FILES="$CONFIG_FILES library/lammpi/Makefile" ;;
@@ -16893,7 +16893,7 @@ do
     "LGPL/JPL/jpl_paths.yap") CONFIG_FILES="$CONFIG_FILES LGPL/JPL/jpl_paths.yap" ;;
     "GPL/http/Makefile") CONFIG_FILES="$CONFIG_FILES GPL/http/Makefile" ;;
     "GPL/Makefile") CONFIG_FILES="$CONFIG_FILES GPL/Makefile" ;;
-    "cplint/Makefile") CONFIG_FILES="$CONFIG_FILES cplint/Makefile" ;;
+    "pakcgaes/cplint/Makefile") CONFIG_FILES="$CONFIG_FILES pakcgaes/cplint/Makefile" ;;
     "LGPL/PLStream/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/PLStream/Makefile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -17548,4 +17548,4 @@ fi
 
 
 make depend
-(cd LGPL/PLStream; make depend; cd ../..)
+(cd packages/PLStream; make depend; cd ../..)
diff --git a/configure.in b/configure.in
index 20d1e62d7..371f30274 100644
--- a/configure.in
+++ b/configure.in
@@ -1439,7 +1439,7 @@ mkdir -p  library/lammpi
 mkdir -p  library/yap2swi
 mkdir -p  CHR
 mkdir -p  CLPQR
-mkdir -p  CLPBN
+mkdir -p  packages/CLPBN
 mkdir -p  LGPL
 mkdir -p  LGPL/JPL
 mkdir -p  LGPL/JPL/java
@@ -1448,15 +1448,15 @@ mkdir -p  LGPL/JPL/java/jpl/fli
 mkdir -p  LGPL/JPL/java/jpl/test
 mkdir -p  LGPL/JPL/src
 mkdir -p  LGPL/clp
-mkdir -p  LGPL/chr
+mkdir -p  packages/chr
 mkdir -p  LGPL/swi_console
-mkdir -p  LGPL/PLStream
+mkdir -p  packages/PLStream
 mkdir -p  GPL
 mkdir -p  GPL/clpqr
 mkdir -p  GPL/http
-mkdir -p  cplint
+mkdir -p  packages/cplint
 
-AC_OUTPUT(Makefile library/matrix/Makefile library/matlab/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/Makefile LGPL/chr/Makefile CLPBN/Makefile LGPL/clp/Makefile GPL/clpqr/Makefile library/lammpi/Makefile library/tries/Makefile library/rltree/Makefile LGPL/swi_console/Makefile  LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile  LGPL/JPL/jpl_paths.yap GPL/http/Makefile GPL/Makefile  cplint/Makefile LGPL/PLStream/Makefile)
+AC_OUTPUT(Makefile library/matrix/Makefile library/matlab/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/Makefile packages/chr/Makefile packages/CLPBN/Makefile LGPL/clp/Makefile GPL/clpqr/Makefile library/lammpi/Makefile library/tries/Makefile library/rltree/Makefile LGPL/swi_console/Makefile  LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile  LGPL/JPL/jpl_paths.yap GPL/http/Makefile GPL/Makefile  pakcgaes/cplint/Makefile LGPL/PLStream/Makefile)
 
 make depend
-(cd LGPL/PLStream; make depend; cd ../..)
+(cd packages/PLStream; make depend; cd ../..)
diff --git a/LGPL/PLStream/ATOMS b/packages/PLStream/ATOMS
similarity index 100%
rename from LGPL/PLStream/ATOMS
rename to packages/PLStream/ATOMS
diff --git a/LGPL/PLStream/Makefile.in b/packages/PLStream/Makefile.in
similarity index 100%
rename from LGPL/PLStream/Makefile.in
rename to packages/PLStream/Makefile.in
diff --git a/LGPL/PLStream/atoms.h b/packages/PLStream/atoms.h
similarity index 100%
rename from LGPL/PLStream/atoms.h
rename to packages/PLStream/atoms.h
diff --git a/LGPL/PLStream/buildatoms b/packages/PLStream/buildatoms
similarity index 100%
rename from LGPL/PLStream/buildatoms
rename to packages/PLStream/buildatoms
diff --git a/LGPL/PLStream/pl-buffer.c b/packages/PLStream/pl-buffer.c
similarity index 100%
rename from LGPL/PLStream/pl-buffer.c
rename to packages/PLStream/pl-buffer.c
diff --git a/LGPL/PLStream/pl-buffer.h b/packages/PLStream/pl-buffer.h
similarity index 100%
rename from LGPL/PLStream/pl-buffer.h
rename to packages/PLStream/pl-buffer.h
diff --git a/LGPL/PLStream/pl-ctype.c b/packages/PLStream/pl-ctype.c
similarity index 100%
rename from LGPL/PLStream/pl-ctype.c
rename to packages/PLStream/pl-ctype.c
diff --git a/LGPL/PLStream/pl-ctype.h b/packages/PLStream/pl-ctype.h
similarity index 100%
rename from LGPL/PLStream/pl-ctype.h
rename to packages/PLStream/pl-ctype.h
diff --git a/LGPL/PLStream/pl-error.c b/packages/PLStream/pl-error.c
similarity index 100%
rename from LGPL/PLStream/pl-error.c
rename to packages/PLStream/pl-error.c
diff --git a/LGPL/PLStream/pl-error.h b/packages/PLStream/pl-error.h
similarity index 100%
rename from LGPL/PLStream/pl-error.h
rename to packages/PLStream/pl-error.h
diff --git a/LGPL/PLStream/pl-feature.c b/packages/PLStream/pl-feature.c
similarity index 100%
rename from LGPL/PLStream/pl-feature.c
rename to packages/PLStream/pl-feature.c
diff --git a/LGPL/PLStream/pl-file.c b/packages/PLStream/pl-file.c
similarity index 100%
rename from LGPL/PLStream/pl-file.c
rename to packages/PLStream/pl-file.c
diff --git a/LGPL/PLStream/pl-incl.h b/packages/PLStream/pl-incl.h
similarity index 100%
rename from LGPL/PLStream/pl-incl.h
rename to packages/PLStream/pl-incl.h
diff --git a/LGPL/PLStream/pl-opts.h b/packages/PLStream/pl-opts.h
similarity index 100%
rename from LGPL/PLStream/pl-opts.h
rename to packages/PLStream/pl-opts.h
diff --git a/LGPL/PLStream/pl-os.c b/packages/PLStream/pl-os.c
similarity index 100%
rename from LGPL/PLStream/pl-os.c
rename to packages/PLStream/pl-os.c
diff --git a/LGPL/PLStream/pl-os.h b/packages/PLStream/pl-os.h
similarity index 100%
rename from LGPL/PLStream/pl-os.h
rename to packages/PLStream/pl-os.h
diff --git a/LGPL/PLStream/pl-stream.c b/packages/PLStream/pl-stream.c
similarity index 100%
rename from LGPL/PLStream/pl-stream.c
rename to packages/PLStream/pl-stream.c
diff --git a/LGPL/PLStream/pl-stream.h b/packages/PLStream/pl-stream.h
similarity index 100%
rename from LGPL/PLStream/pl-stream.h
rename to packages/PLStream/pl-stream.h
diff --git a/LGPL/PLStream/pl-string.c b/packages/PLStream/pl-string.c
similarity index 100%
rename from LGPL/PLStream/pl-string.c
rename to packages/PLStream/pl-string.c
diff --git a/LGPL/PLStream/pl-table.c b/packages/PLStream/pl-table.c
similarity index 100%
rename from LGPL/PLStream/pl-table.c
rename to packages/PLStream/pl-table.c
diff --git a/LGPL/PLStream/pl-table.h b/packages/PLStream/pl-table.h
similarity index 100%
rename from LGPL/PLStream/pl-table.h
rename to packages/PLStream/pl-table.h
diff --git a/LGPL/PLStream/pl-text.c b/packages/PLStream/pl-text.c
similarity index 100%
rename from LGPL/PLStream/pl-text.c
rename to packages/PLStream/pl-text.c
diff --git a/LGPL/PLStream/pl-text.h b/packages/PLStream/pl-text.h
similarity index 100%
rename from LGPL/PLStream/pl-text.h
rename to packages/PLStream/pl-text.h
diff --git a/LGPL/PLStream/pl-utf8.c b/packages/PLStream/pl-utf8.c
similarity index 100%
rename from LGPL/PLStream/pl-utf8.c
rename to packages/PLStream/pl-utf8.c
diff --git a/LGPL/PLStream/pl-utf8.h b/packages/PLStream/pl-utf8.h
similarity index 100%
rename from LGPL/PLStream/pl-utf8.h
rename to packages/PLStream/pl-utf8.h
diff --git a/LGPL/PLStream/pl-yap.c b/packages/PLStream/pl-yap.c
similarity index 100%
rename from LGPL/PLStream/pl-yap.c
rename to packages/PLStream/pl-yap.c
diff --git a/LGPL/PLStream/pl-yap.h b/packages/PLStream/pl-yap.h
similarity index 100%
rename from LGPL/PLStream/pl-yap.h
rename to packages/PLStream/pl-yap.h