diff --git a/build-aux/check-mescc.sh b/build-aux/check-mescc.sh
index bc1a33c9..67b9e997 100755
--- a/build-aux/check-mescc.sh
+++ b/build-aux/check-mescc.sh
@@ -26,170 +26,170 @@ set -e
 test_sh=${test_sh-${srcdest}build-aux/test.sh}
 
 tests="
-scaffold/tests/t
-scaffold/tests/00-exit-0
-scaffold/tests/01-return-0
-scaffold/tests/02-return-1
-scaffold/tests/03-call
-scaffold/tests/04-call-0
-scaffold/tests/05-call-1
-scaffold/tests/06-call-not-1
-scaffold/tests/06-not-call-1
-scaffold/tests/06-call-2
-scaffold/tests/06-call-string
-scaffold/tests/06-call-variable
-scaffold/tests/06-return-void
-scaffold/tests/07-include
-scaffold/tests/08-assign
-scaffold/tests/08-assign-negative
-scaffold/tests/08-assign-global
-scaffold/tests/10-if-0
-scaffold/tests/11-if-1
-scaffold/tests/12-if-eq
-scaffold/tests/13-if-neq
-scaffold/tests/14-if-goto
-scaffold/tests/15-if-not-f
-scaffold/tests/16-if-t
-scaffold/tests/17-compare-char
-scaffold/tests/17-compare-ge
-scaffold/tests/17-compare-gt
-scaffold/tests/17-compare-le
-scaffold/tests/17-compare-lt
-scaffold/tests/17-compare-unsigned-ge
-scaffold/tests/17-compare-unsigned-gt
-scaffold/tests/17-compare-unsigned-le
-scaffold/tests/17-compare-unsigned-lt
-scaffold/tests/17-compare-unsigned-char-le
-scaffold/tests/17-compare-unsigned-short-le
-scaffold/tests/17-compare-unsigned-long-le
-scaffold/tests/17-compare-and
-scaffold/tests/17-compare-or
-scaffold/tests/17-compare-and-or
-scaffold/tests/17-compare-assign
-scaffold/tests/17-compare-call
-scaffold/tests/18-assign-shadow
-scaffold/tests/20-while
-scaffold/tests/21-char-array-simple
-scaffold/tests/21-char-array
-scaffold/tests/22-while-char-array
-scaffold/tests/23-global-pointer-init-null
-scaffold/tests/23-global-pointer-init
-scaffold/tests/23-global-pointer-ref
-scaffold/tests/23-global-pointer-pointer-ref
-scaffold/tests/23-pointer-sub
-scaffold/tests/23-pointer
+lib/tests/scaffold/t
+lib/tests/scaffold/00-exit-0
+lib/tests/scaffold/01-return-0
+lib/tests/scaffold/02-return-1
+lib/tests/scaffold/03-call
+lib/tests/scaffold/04-call-0
+lib/tests/scaffold/05-call-1
+lib/tests/scaffold/06-call-not-1
+lib/tests/scaffold/06-not-call-1
+lib/tests/scaffold/06-call-2
+lib/tests/scaffold/06-call-string
+lib/tests/scaffold/06-call-variable
+lib/tests/scaffold/06-return-void
+lib/tests/scaffold/07-include
+lib/tests/scaffold/08-assign
+lib/tests/scaffold/08-assign-negative
+lib/tests/scaffold/08-assign-global
+lib/tests/scaffold/10-if-0
+lib/tests/scaffold/11-if-1
+lib/tests/scaffold/12-if-eq
+lib/tests/scaffold/13-if-neq
+lib/tests/scaffold/14-if-goto
+lib/tests/scaffold/15-if-not-f
+lib/tests/scaffold/16-if-t
+lib/tests/scaffold/17-compare-char
+lib/tests/scaffold/17-compare-ge
+lib/tests/scaffold/17-compare-gt
+lib/tests/scaffold/17-compare-le
+lib/tests/scaffold/17-compare-lt
+lib/tests/scaffold/17-compare-unsigned-ge
+lib/tests/scaffold/17-compare-unsigned-gt
+lib/tests/scaffold/17-compare-unsigned-le
+lib/tests/scaffold/17-compare-unsigned-lt
+lib/tests/scaffold/17-compare-unsigned-char-le
+lib/tests/scaffold/17-compare-unsigned-short-le
+lib/tests/scaffold/17-compare-unsigned-long-le
+lib/tests/scaffold/17-compare-and
+lib/tests/scaffold/17-compare-or
+lib/tests/scaffold/17-compare-and-or
+lib/tests/scaffold/17-compare-assign
+lib/tests/scaffold/17-compare-call
+lib/tests/scaffold/18-assign-shadow
+lib/tests/scaffold/20-while
+lib/tests/scaffold/21-char-array-simple
+lib/tests/scaffold/21-char-array
+lib/tests/scaffold/22-while-char-array
+lib/tests/scaffold/23-global-pointer-init-null
+lib/tests/scaffold/23-global-pointer-init
+lib/tests/scaffold/23-global-pointer-ref
+lib/tests/scaffold/23-global-pointer-pointer-ref
+lib/tests/scaffold/23-pointer-sub
+lib/tests/scaffold/23-pointer
 lib/tests/mes/30-oputs
 lib/tests/string/30-strlen
-scaffold/tests/32-call-wrap
-scaffold/tests/32-compare
-scaffold/tests/33-and-or
-scaffold/tests/34-pre-post
-scaffold/tests/35-compare-char
-scaffold/tests/36-compare-arithmetic
-scaffold/tests/37-compare-assign
-scaffold/tests/38-compare-call-2
-scaffold/tests/38-compare-call-3
-scaffold/tests/38-compare-call
-scaffold/tests/40-if-else
-scaffold/tests/41-ternary
-scaffold/tests/42-goto-label
-scaffold/tests/43-for-do-while
-scaffold/tests/44-switch
-scaffold/tests/44-switch-fallthrough
-scaffold/tests/44-switch-body-fallthrough
-scaffold/tests/45-void-call
-scaffold/tests/46-function-static
-scaffold/tests/47-function-expression
-scaffold/tests/48-global-static
+lib/tests/scaffold/32-call-wrap
+lib/tests/scaffold/32-compare
+lib/tests/scaffold/33-and-or
+lib/tests/scaffold/34-pre-post
+lib/tests/scaffold/35-compare-char
+lib/tests/scaffold/36-compare-arithmetic
+lib/tests/scaffold/37-compare-assign
+lib/tests/scaffold/38-compare-call-2
+lib/tests/scaffold/38-compare-call-3
+lib/tests/scaffold/38-compare-call
+lib/tests/scaffold/40-if-else
+lib/tests/scaffold/41-ternary
+lib/tests/scaffold/42-goto-label
+lib/tests/scaffold/43-for-do-while
+lib/tests/scaffold/44-switch
+lib/tests/scaffold/44-switch-fallthrough
+lib/tests/scaffold/44-switch-body-fallthrough
+lib/tests/scaffold/45-void-call
+lib/tests/scaffold/46-function-static
+lib/tests/scaffold/47-function-expression
+lib/tests/scaffold/48-global-static
 lib/tests/assert/50-assert
 lib/tests/mes/50-itoa
 lib/tests/posix/50-getenv
 lib/tests/string/50-strcmp
 lib/tests/string/50-strcpy
 lib/tests/string/50-strncmp
-scaffold/tests/51-pointer-sub
-scaffold/tests/54-argc
-scaffold/tests/54-argv
-scaffold/tests/55-char-array
-scaffold/tests/60-math
-scaffold/tests/61-array
-scaffold/tests/62-array
-scaffold/tests/63-struct
-scaffold/tests/63-struct-pointer
-scaffold/tests/63-struct-local
-scaffold/tests/63-struct-function
-scaffold/tests/63-struct-assign
-scaffold/tests/63-struct-array
-scaffold/tests/63-struct-array-assign
-scaffold/tests/63-struct-array-compare
-scaffold/tests/63-struct-cell
-scaffold/tests/64-make-cell
-scaffold/tests/65-read
-scaffold/tests/66-local-char-array
-scaffold/tests/70-stdarg
+lib/tests/scaffold/51-pointer-sub
+lib/tests/scaffold/54-argc
+lib/tests/scaffold/54-argv
+lib/tests/scaffold/55-char-array
+lib/tests/scaffold/60-math
+lib/tests/scaffold/61-array
+lib/tests/scaffold/62-array
+lib/tests/scaffold/63-struct
+lib/tests/scaffold/63-struct-pointer
+lib/tests/scaffold/63-struct-local
+lib/tests/scaffold/63-struct-function
+lib/tests/scaffold/63-struct-assign
+lib/tests/scaffold/63-struct-array
+lib/tests/scaffold/63-struct-array-assign
+lib/tests/scaffold/63-struct-array-compare
+lib/tests/scaffold/63-struct-cell
+lib/tests/scaffold/64-make-cell
+lib/tests/scaffold/65-read
+lib/tests/scaffold/66-local-char-array
+lib/tests/scaffold/70-stdarg
 lib/tests/stdio/70-printf-hello
 lib/tests/stdio/70-printf-simple
 lib/tests/stdio/70-printf
 lib/tests/stdlib/70-strtoull
 lib/tests/string/70-strchr
-scaffold/tests/71-struct-array
-scaffold/tests/72-typedef-struct-def
-scaffold/tests/73-union-hello
-scaffold/tests/73-union
-scaffold/tests/74-multi-line-string
-scaffold/tests/75-struct-union
-scaffold/tests/76-pointer-arithmetic-pp
-scaffold/tests/76-pointer-arithmetic
-scaffold/tests/77-pointer-assign
-scaffold/tests/78-union-struct
-scaffold/tests/79-int-array-simple
-scaffold/tests/79-int-array
-scaffold/tests/7a-struct-char-array
-scaffold/tests/7b-struct-int-array-hello
-scaffold/tests/7b-struct-int-array-pointer
-scaffold/tests/7b-struct-int-array
-scaffold/tests/7c-dynarray
-scaffold/tests/7d-cast-char
-scaffold/tests/7e-struct-array-access
-scaffold/tests/7f-struct-pointer-arithmetic
-scaffold/tests/7g-struct-byte-word-field
-scaffold/tests/7h-struct-assign
-scaffold/tests/7i-struct-struct-simple
-scaffold/tests/7i-struct-struct
-scaffold/tests/7k-empty-for
-scaffold/tests/7k-for-each-elem-simple
-scaffold/tests/7k-for-each-elem
-scaffold/tests/7l-struct-any-size-array-simple
-scaffold/tests/7l-struct-any-size-array
-scaffold/tests/7m-struct-char-array-assign
-scaffold/tests/7n-struct-struct-array
-scaffold/tests/7o-struct-pre-post-simple
-scaffold/tests/7o-struct-pre-post
-scaffold/tests/7p-struct-cast
-scaffold/tests/7q-bit-field-simple
-scaffold/tests/7q-bit-field
-scaffold/tests/7r-sign-extend
-scaffold/tests/7s-struct-short
-scaffold/tests/7s-unsigned-compare
-scaffold/tests/7t-function-destruct
-scaffold/tests/7u-double
-scaffold/tests/7u-long-long
-scaffold/tests/7u-ternary-expression
-scaffold/tests/7u-call-ternary
-scaffold/tests/7u-inc-byte-word
-scaffold/tests/7u-struct-func
-scaffold/tests/7u-struct-size10
-scaffold/tests/7u-vstack
+lib/tests/scaffold/71-struct-array
+lib/tests/scaffold/72-typedef-struct-def
+lib/tests/scaffold/73-union-hello
+lib/tests/scaffold/73-union
+lib/tests/scaffold/74-multi-line-string
+lib/tests/scaffold/75-struct-union
+lib/tests/scaffold/76-pointer-arithmetic-pp
+lib/tests/scaffold/76-pointer-arithmetic
+lib/tests/scaffold/77-pointer-assign
+lib/tests/scaffold/78-union-struct
+lib/tests/scaffold/79-int-array-simple
+lib/tests/scaffold/79-int-array
+lib/tests/scaffold/7a-struct-char-array
+lib/tests/scaffold/7b-struct-int-array-hello
+lib/tests/scaffold/7b-struct-int-array-pointer
+lib/tests/scaffold/7b-struct-int-array
+lib/tests/scaffold/7c-dynarray
+lib/tests/scaffold/7d-cast-char
+lib/tests/scaffold/7e-struct-array-access
+lib/tests/scaffold/7f-struct-pointer-arithmetic
+lib/tests/scaffold/7g-struct-byte-word-field
+lib/tests/scaffold/7h-struct-assign
+lib/tests/scaffold/7i-struct-struct-simple
+lib/tests/scaffold/7i-struct-struct
+lib/tests/scaffold/7k-empty-for
+lib/tests/scaffold/7k-for-each-elem-simple
+lib/tests/scaffold/7k-for-each-elem
+lib/tests/scaffold/7l-struct-any-size-array-simple
+lib/tests/scaffold/7l-struct-any-size-array
+lib/tests/scaffold/7m-struct-char-array-assign
+lib/tests/scaffold/7n-struct-struct-array
+lib/tests/scaffold/7o-struct-pre-post-simple
+lib/tests/scaffold/7o-struct-pre-post
+lib/tests/scaffold/7p-struct-cast
+lib/tests/scaffold/7q-bit-field-simple
+lib/tests/scaffold/7q-bit-field
+lib/tests/scaffold/7r-sign-extend
+lib/tests/scaffold/7s-struct-short
+lib/tests/scaffold/7s-unsigned-compare
+lib/tests/scaffold/7t-function-destruct
+lib/tests/scaffold/7u-double
+lib/tests/scaffold/7u-long-long
+lib/tests/scaffold/7u-ternary-expression
+lib/tests/scaffold/7u-call-ternary
+lib/tests/scaffold/7u-inc-byte-word
+lib/tests/scaffold/7u-struct-func
+lib/tests/scaffold/7u-struct-size10
+lib/tests/scaffold/7u-vstack
 lib/tests/setjmp/80-setjmp
 lib/tests/stdio/80-sscanf
 lib/tests/stdlib/80-qsort
 lib/tests/stdlib/80-qsort-dupes
 lib/tests/string/80-strncpy
 lib/tests/string/80-strrchr
-scaffold/tests/82-define
-scaffold/tests/83-heterogenoous-init
-scaffold/tests/84-struct-field-list
-scaffold/tests/85-sizeof
+lib/tests/scaffold/82-define
+lib/tests/scaffold/83-heterogenoous-init
+lib/tests/scaffold/84-struct-field-list
+lib/tests/scaffold/85-sizeof
 lib/tests/dirent/90-readdir
 lib/tests/io/90-stat
 lib/tests/posix/90-unsetenv
@@ -202,39 +202,39 @@ lib/tests/stdlib/90-strtol
 lib/tests/string/90-snprintf
 lib/tests/string/90-strpbrk
 lib/tests/string/90-strspn
-scaffold/tests/a0-call-trunc-char
-scaffold/tests/a0-call-trunc-short
-scaffold/tests/a0-call-trunc-int
-scaffold/tests/a0-math-divide-signed-negative
-scaffold/tests/a1-global-no-align
-scaffold/tests/a1-global-no-clobber
+lib/tests/scaffold/a0-call-trunc-char
+lib/tests/scaffold/a0-call-trunc-short
+lib/tests/scaffold/a0-call-trunc-int
+lib/tests/scaffold/a0-math-divide-signed-negative
+lib/tests/scaffold/a1-global-no-align
+lib/tests/scaffold/a1-global-no-clobber
 "
 
 broken="$broken
+lib/tests/scaffold/17-compare-unsigned-char-le
+lib/tests/scaffold/17-compare-unsigned-short-le
+lib/tests/scaffold/66-local-char-array
+lib/tests/scaffold/a0-call-trunc-int
+lib/tests/scaffold/a0-math-divide-signed-negative
 lib/tests/posix/50-getenv
-scaffold/tests/17-compare-unsigned-char-le
-scaffold/tests/17-compare-unsigned-short-le
-scaffold/tests/66-local-char-array
-scaffold/tests/a0-call-trunc-int
-scaffold/tests/a0-math-divide-signed-negative
 "
 
 if [ "$mes_arch" = "x86_64-gcc" ]; then
     broken="$broken
-scaffold/tests/21-char-array
-scaffold/tests/41-ternary
-scaffold/tests/stdio/70-printf-stdarg
-scaffold/tests/stdio/70-printf-simple
-scaffold/tests/stdio/70-printf
+lib/tests/scaffold/21-char-array
+lib/tests/scaffold/41-ternary
+lib/tests/scaffold/stdio/70-printf-stdarg
+lib/tests/scaffold/stdio/70-printf-simple
+lib/tests/scaffold/stdio/70-printf
 lib/tests/setjmp/80-setjmp
-scaffold/tests/a1-global-no-align
+lib/tests/scaffold/a1-global-no-align
 "
     # Debian: debugme itoa is broken
     broken="$broken
-scaffold/tests/47-function-expression
-scaffold/tests/62-array
-scaffold/tests/65-read
-scaffold/tests/85-sizeof
+lib/tests/scaffold/47-function-expression
+lib/tests/scaffold/62-array
+lib/tests/scaffold/65-read
+lib/tests/scaffold/85-sizeof
 lib/tests/mes/90-abtod
 lib/tests/mes/90-dtoab
 lib/tests/posix/90-execlp
diff --git a/lib/tests/dirent/90-readdir.c b/lib/tests/dirent/90-readdir.c
index 602b6176..8f225d2a 100644
--- a/lib/tests/dirent/90-readdir.c
+++ b/lib/tests/dirent/90-readdir.c
@@ -34,20 +34,20 @@ qsort_strcmp (void const *a, void const *b)
 int
 main ()
 {
-  DIR *d = opendir ("lib/tests/dirent/readdir-fu");
+  DIR *d = opendir ("../lib/tests/dirent/readdir-fu");
   if (d)
     return 1;
   if (errno != ENOENT)
     return 2;
 
-  d = opendir ("lib/tests/dirent/90-readdir.c");
+  d = opendir ("../lib/tests/dirent/90-readdir.c");
   if (d)
     return 3;
   if (errno != ENOTDIR)
     return 4;
 
   errno = 0;
-  d = opendir ("lib/tests/dirent/readdir.dir");
+  d = opendir ("../lib/tests/dirent/readdir.dir");
   if (!d)
     return 5;
 
diff --git a/lib/tests/io/90-stat.c b/lib/tests/io/90-stat.c
index a2d49830..41820842 100644
--- a/lib/tests/io/90-stat.c
+++ b/lib/tests/io/90-stat.c
@@ -66,7 +66,7 @@ main ()
   // char *name = "boo";
   // errno = 0;
   // fprintf (stderr, "%s: %s\n", name, strerror (errno));
-  int fd = open ("COPYING", 0);
+  int fd = open ("../COPYING", 0);
 
   struct stat sbuf;
 
diff --git a/scaffold/tests/00-exit-0.c b/lib/tests/scaffold/00-exit-0.c
similarity index 100%
rename from scaffold/tests/00-exit-0.c
rename to lib/tests/scaffold/00-exit-0.c
diff --git a/scaffold/tests/01-return-0.c b/lib/tests/scaffold/01-return-0.c
similarity index 100%
rename from scaffold/tests/01-return-0.c
rename to lib/tests/scaffold/01-return-0.c
diff --git a/scaffold/tests/02-return-1.c b/lib/tests/scaffold/02-return-1.c
similarity index 100%
rename from scaffold/tests/02-return-1.c
rename to lib/tests/scaffold/02-return-1.c
diff --git a/scaffold/tests/02-return-1.exit b/lib/tests/scaffold/02-return-1.exit
similarity index 100%
rename from scaffold/tests/02-return-1.exit
rename to lib/tests/scaffold/02-return-1.exit
diff --git a/scaffold/tests/03-call.c b/lib/tests/scaffold/03-call.c
similarity index 100%
rename from scaffold/tests/03-call.c
rename to lib/tests/scaffold/03-call.c
diff --git a/scaffold/tests/04-call-0.c b/lib/tests/scaffold/04-call-0.c
similarity index 100%
rename from scaffold/tests/04-call-0.c
rename to lib/tests/scaffold/04-call-0.c
diff --git a/scaffold/tests/05-call-1.c b/lib/tests/scaffold/05-call-1.c
similarity index 100%
rename from scaffold/tests/05-call-1.c
rename to lib/tests/scaffold/05-call-1.c
diff --git a/scaffold/tests/05-call-1.exit b/lib/tests/scaffold/05-call-1.exit
similarity index 100%
rename from scaffold/tests/05-call-1.exit
rename to lib/tests/scaffold/05-call-1.exit
diff --git a/scaffold/tests/06-call-2.c b/lib/tests/scaffold/06-call-2.c
similarity index 100%
rename from scaffold/tests/06-call-2.c
rename to lib/tests/scaffold/06-call-2.c
diff --git a/scaffold/tests/06-call-not-1.c b/lib/tests/scaffold/06-call-not-1.c
similarity index 100%
rename from scaffold/tests/06-call-not-1.c
rename to lib/tests/scaffold/06-call-not-1.c
diff --git a/scaffold/tests/06-call-string.c b/lib/tests/scaffold/06-call-string.c
similarity index 100%
rename from scaffold/tests/06-call-string.c
rename to lib/tests/scaffold/06-call-string.c
diff --git a/scaffold/tests/06-call-variable.c b/lib/tests/scaffold/06-call-variable.c
similarity index 100%
rename from scaffold/tests/06-call-variable.c
rename to lib/tests/scaffold/06-call-variable.c
diff --git a/scaffold/tests/06-not-call-1.c b/lib/tests/scaffold/06-not-call-1.c
similarity index 100%
rename from scaffold/tests/06-not-call-1.c
rename to lib/tests/scaffold/06-not-call-1.c
diff --git a/scaffold/tests/06-return-void.c b/lib/tests/scaffold/06-return-void.c
similarity index 100%
rename from scaffold/tests/06-return-void.c
rename to lib/tests/scaffold/06-return-void.c
diff --git a/scaffold/tests/07-include.c b/lib/tests/scaffold/07-include.c
similarity index 100%
rename from scaffold/tests/07-include.c
rename to lib/tests/scaffold/07-include.c
diff --git a/scaffold/tests/07-include.exit b/lib/tests/scaffold/07-include.exit
similarity index 100%
rename from scaffold/tests/07-include.exit
rename to lib/tests/scaffold/07-include.exit
diff --git a/scaffold/tests/08-assign-global.c b/lib/tests/scaffold/08-assign-global.c
similarity index 100%
rename from scaffold/tests/08-assign-global.c
rename to lib/tests/scaffold/08-assign-global.c
diff --git a/scaffold/tests/08-assign-negative.c b/lib/tests/scaffold/08-assign-negative.c
similarity index 100%
rename from scaffold/tests/08-assign-negative.c
rename to lib/tests/scaffold/08-assign-negative.c
diff --git a/scaffold/tests/08-assign.c b/lib/tests/scaffold/08-assign.c
similarity index 100%
rename from scaffold/tests/08-assign.c
rename to lib/tests/scaffold/08-assign.c
diff --git a/scaffold/tests/10-if-0.c b/lib/tests/scaffold/10-if-0.c
similarity index 100%
rename from scaffold/tests/10-if-0.c
rename to lib/tests/scaffold/10-if-0.c
diff --git a/scaffold/tests/11-if-1.c b/lib/tests/scaffold/11-if-1.c
similarity index 100%
rename from scaffold/tests/11-if-1.c
rename to lib/tests/scaffold/11-if-1.c
diff --git a/scaffold/tests/12-if-eq.c b/lib/tests/scaffold/12-if-eq.c
similarity index 100%
rename from scaffold/tests/12-if-eq.c
rename to lib/tests/scaffold/12-if-eq.c
diff --git a/scaffold/tests/13-if-neq.c b/lib/tests/scaffold/13-if-neq.c
similarity index 100%
rename from scaffold/tests/13-if-neq.c
rename to lib/tests/scaffold/13-if-neq.c
diff --git a/scaffold/tests/14-if-goto.c b/lib/tests/scaffold/14-if-goto.c
similarity index 100%
rename from scaffold/tests/14-if-goto.c
rename to lib/tests/scaffold/14-if-goto.c
diff --git a/scaffold/tests/15-if-not-f.c b/lib/tests/scaffold/15-if-not-f.c
similarity index 100%
rename from scaffold/tests/15-if-not-f.c
rename to lib/tests/scaffold/15-if-not-f.c
diff --git a/scaffold/tests/16-if-t.c b/lib/tests/scaffold/16-if-t.c
similarity index 100%
rename from scaffold/tests/16-if-t.c
rename to lib/tests/scaffold/16-if-t.c
diff --git a/scaffold/tests/17-compare-and-or.c b/lib/tests/scaffold/17-compare-and-or.c
similarity index 100%
rename from scaffold/tests/17-compare-and-or.c
rename to lib/tests/scaffold/17-compare-and-or.c
diff --git a/scaffold/tests/17-compare-and.c b/lib/tests/scaffold/17-compare-and.c
similarity index 100%
rename from scaffold/tests/17-compare-and.c
rename to lib/tests/scaffold/17-compare-and.c
diff --git a/scaffold/tests/17-compare-assign.c b/lib/tests/scaffold/17-compare-assign.c
similarity index 100%
rename from scaffold/tests/17-compare-assign.c
rename to lib/tests/scaffold/17-compare-assign.c
diff --git a/scaffold/tests/17-compare-call.c b/lib/tests/scaffold/17-compare-call.c
similarity index 100%
rename from scaffold/tests/17-compare-call.c
rename to lib/tests/scaffold/17-compare-call.c
diff --git a/scaffold/tests/17-compare-char.c b/lib/tests/scaffold/17-compare-char.c
similarity index 100%
rename from scaffold/tests/17-compare-char.c
rename to lib/tests/scaffold/17-compare-char.c
diff --git a/scaffold/tests/17-compare-ge.c b/lib/tests/scaffold/17-compare-ge.c
similarity index 100%
rename from scaffold/tests/17-compare-ge.c
rename to lib/tests/scaffold/17-compare-ge.c
diff --git a/scaffold/tests/17-compare-gt.c b/lib/tests/scaffold/17-compare-gt.c
similarity index 100%
rename from scaffold/tests/17-compare-gt.c
rename to lib/tests/scaffold/17-compare-gt.c
diff --git a/scaffold/tests/17-compare-le.c b/lib/tests/scaffold/17-compare-le.c
similarity index 100%
rename from scaffold/tests/17-compare-le.c
rename to lib/tests/scaffold/17-compare-le.c
diff --git a/scaffold/tests/17-compare-lt.c b/lib/tests/scaffold/17-compare-lt.c
similarity index 100%
rename from scaffold/tests/17-compare-lt.c
rename to lib/tests/scaffold/17-compare-lt.c
diff --git a/scaffold/tests/17-compare-or.c b/lib/tests/scaffold/17-compare-or.c
similarity index 100%
rename from scaffold/tests/17-compare-or.c
rename to lib/tests/scaffold/17-compare-or.c
diff --git a/scaffold/tests/17-compare-unsigned-char-le.c b/lib/tests/scaffold/17-compare-unsigned-char-le.c
similarity index 100%
rename from scaffold/tests/17-compare-unsigned-char-le.c
rename to lib/tests/scaffold/17-compare-unsigned-char-le.c
diff --git a/scaffold/tests/17-compare-unsigned-ge.c b/lib/tests/scaffold/17-compare-unsigned-ge.c
similarity index 100%
rename from scaffold/tests/17-compare-unsigned-ge.c
rename to lib/tests/scaffold/17-compare-unsigned-ge.c
diff --git a/scaffold/tests/17-compare-unsigned-gt.c b/lib/tests/scaffold/17-compare-unsigned-gt.c
similarity index 100%
rename from scaffold/tests/17-compare-unsigned-gt.c
rename to lib/tests/scaffold/17-compare-unsigned-gt.c
diff --git a/scaffold/tests/17-compare-unsigned-le.c b/lib/tests/scaffold/17-compare-unsigned-le.c
similarity index 100%
rename from scaffold/tests/17-compare-unsigned-le.c
rename to lib/tests/scaffold/17-compare-unsigned-le.c
diff --git a/scaffold/tests/17-compare-unsigned-long-le.c b/lib/tests/scaffold/17-compare-unsigned-long-le.c
similarity index 100%
rename from scaffold/tests/17-compare-unsigned-long-le.c
rename to lib/tests/scaffold/17-compare-unsigned-long-le.c
diff --git a/scaffold/tests/17-compare-unsigned-lt.c b/lib/tests/scaffold/17-compare-unsigned-lt.c
similarity index 100%
rename from scaffold/tests/17-compare-unsigned-lt.c
rename to lib/tests/scaffold/17-compare-unsigned-lt.c
diff --git a/scaffold/tests/17-compare-unsigned-short-le.c b/lib/tests/scaffold/17-compare-unsigned-short-le.c
similarity index 100%
rename from scaffold/tests/17-compare-unsigned-short-le.c
rename to lib/tests/scaffold/17-compare-unsigned-short-le.c
diff --git a/scaffold/tests/18-assign-shadow.c b/lib/tests/scaffold/18-assign-shadow.c
similarity index 100%
rename from scaffold/tests/18-assign-shadow.c
rename to lib/tests/scaffold/18-assign-shadow.c
diff --git a/scaffold/tests/20-while.c b/lib/tests/scaffold/20-while.c
similarity index 100%
rename from scaffold/tests/20-while.c
rename to lib/tests/scaffold/20-while.c
diff --git a/scaffold/tests/21-char-array-simple.c b/lib/tests/scaffold/21-char-array-simple.c
similarity index 100%
rename from scaffold/tests/21-char-array-simple.c
rename to lib/tests/scaffold/21-char-array-simple.c
diff --git a/scaffold/tests/21-char-array.c b/lib/tests/scaffold/21-char-array.c
similarity index 100%
rename from scaffold/tests/21-char-array.c
rename to lib/tests/scaffold/21-char-array.c
diff --git a/scaffold/tests/22-while-char-array.c b/lib/tests/scaffold/22-while-char-array.c
similarity index 100%
rename from scaffold/tests/22-while-char-array.c
rename to lib/tests/scaffold/22-while-char-array.c
diff --git a/scaffold/tests/23-global-pointer-init-null.c b/lib/tests/scaffold/23-global-pointer-init-null.c
similarity index 100%
rename from scaffold/tests/23-global-pointer-init-null.c
rename to lib/tests/scaffold/23-global-pointer-init-null.c
diff --git a/scaffold/tests/23-global-pointer-init.c b/lib/tests/scaffold/23-global-pointer-init.c
similarity index 100%
rename from scaffold/tests/23-global-pointer-init.c
rename to lib/tests/scaffold/23-global-pointer-init.c
diff --git a/scaffold/tests/23-global-pointer-pointer-ref.c b/lib/tests/scaffold/23-global-pointer-pointer-ref.c
similarity index 100%
rename from scaffold/tests/23-global-pointer-pointer-ref.c
rename to lib/tests/scaffold/23-global-pointer-pointer-ref.c
diff --git a/scaffold/tests/23-global-pointer-ref.c b/lib/tests/scaffold/23-global-pointer-ref.c
similarity index 100%
rename from scaffold/tests/23-global-pointer-ref.c
rename to lib/tests/scaffold/23-global-pointer-ref.c
diff --git a/scaffold/tests/23-pointer-sub.c b/lib/tests/scaffold/23-pointer-sub.c
similarity index 100%
rename from scaffold/tests/23-pointer-sub.c
rename to lib/tests/scaffold/23-pointer-sub.c
diff --git a/scaffold/tests/23-pointer.c b/lib/tests/scaffold/23-pointer.c
similarity index 100%
rename from scaffold/tests/23-pointer.c
rename to lib/tests/scaffold/23-pointer.c
diff --git a/scaffold/tests/32-call-wrap.c b/lib/tests/scaffold/32-call-wrap.c
similarity index 100%
rename from scaffold/tests/32-call-wrap.c
rename to lib/tests/scaffold/32-call-wrap.c
diff --git a/scaffold/tests/32-compare.c b/lib/tests/scaffold/32-compare.c
similarity index 100%
rename from scaffold/tests/32-compare.c
rename to lib/tests/scaffold/32-compare.c
diff --git a/scaffold/tests/33-and-or.c b/lib/tests/scaffold/33-and-or.c
similarity index 100%
rename from scaffold/tests/33-and-or.c
rename to lib/tests/scaffold/33-and-or.c
diff --git a/scaffold/tests/34-pre-post.c b/lib/tests/scaffold/34-pre-post.c
similarity index 100%
rename from scaffold/tests/34-pre-post.c
rename to lib/tests/scaffold/34-pre-post.c
diff --git a/scaffold/tests/35-compare-char.c b/lib/tests/scaffold/35-compare-char.c
similarity index 100%
rename from scaffold/tests/35-compare-char.c
rename to lib/tests/scaffold/35-compare-char.c
diff --git a/scaffold/tests/36-compare-arithmetic.c b/lib/tests/scaffold/36-compare-arithmetic.c
similarity index 100%
rename from scaffold/tests/36-compare-arithmetic.c
rename to lib/tests/scaffold/36-compare-arithmetic.c
diff --git a/scaffold/tests/37-compare-assign.c b/lib/tests/scaffold/37-compare-assign.c
similarity index 100%
rename from scaffold/tests/37-compare-assign.c
rename to lib/tests/scaffold/37-compare-assign.c
diff --git a/scaffold/tests/38-compare-call-2.c b/lib/tests/scaffold/38-compare-call-2.c
similarity index 100%
rename from scaffold/tests/38-compare-call-2.c
rename to lib/tests/scaffold/38-compare-call-2.c
diff --git a/scaffold/tests/38-compare-call-3.c b/lib/tests/scaffold/38-compare-call-3.c
similarity index 100%
rename from scaffold/tests/38-compare-call-3.c
rename to lib/tests/scaffold/38-compare-call-3.c
diff --git a/scaffold/tests/38-compare-call.c b/lib/tests/scaffold/38-compare-call.c
similarity index 100%
rename from scaffold/tests/38-compare-call.c
rename to lib/tests/scaffold/38-compare-call.c
diff --git a/scaffold/tests/40-if-else.c b/lib/tests/scaffold/40-if-else.c
similarity index 100%
rename from scaffold/tests/40-if-else.c
rename to lib/tests/scaffold/40-if-else.c
diff --git a/scaffold/tests/41-ternary.c b/lib/tests/scaffold/41-ternary.c
similarity index 100%
rename from scaffold/tests/41-ternary.c
rename to lib/tests/scaffold/41-ternary.c
diff --git a/scaffold/tests/42-goto-label.c b/lib/tests/scaffold/42-goto-label.c
similarity index 100%
rename from scaffold/tests/42-goto-label.c
rename to lib/tests/scaffold/42-goto-label.c
diff --git a/scaffold/tests/43-for-do-while.c b/lib/tests/scaffold/43-for-do-while.c
similarity index 100%
rename from scaffold/tests/43-for-do-while.c
rename to lib/tests/scaffold/43-for-do-while.c
diff --git a/scaffold/tests/44-switch-body-fallthrough.c b/lib/tests/scaffold/44-switch-body-fallthrough.c
similarity index 100%
rename from scaffold/tests/44-switch-body-fallthrough.c
rename to lib/tests/scaffold/44-switch-body-fallthrough.c
diff --git a/scaffold/tests/44-switch-fallthrough.c b/lib/tests/scaffold/44-switch-fallthrough.c
similarity index 100%
rename from scaffold/tests/44-switch-fallthrough.c
rename to lib/tests/scaffold/44-switch-fallthrough.c
diff --git a/scaffold/tests/44-switch.c b/lib/tests/scaffold/44-switch.c
similarity index 100%
rename from scaffold/tests/44-switch.c
rename to lib/tests/scaffold/44-switch.c
diff --git a/scaffold/tests/45-void-call.c b/lib/tests/scaffold/45-void-call.c
similarity index 100%
rename from scaffold/tests/45-void-call.c
rename to lib/tests/scaffold/45-void-call.c
diff --git a/scaffold/tests/46-function-static.c b/lib/tests/scaffold/46-function-static.c
similarity index 100%
rename from scaffold/tests/46-function-static.c
rename to lib/tests/scaffold/46-function-static.c
diff --git a/scaffold/tests/47-function-expression.c b/lib/tests/scaffold/47-function-expression.c
similarity index 100%
rename from scaffold/tests/47-function-expression.c
rename to lib/tests/scaffold/47-function-expression.c
diff --git a/scaffold/tests/48-global-static.c b/lib/tests/scaffold/48-global-static.c
similarity index 100%
rename from scaffold/tests/48-global-static.c
rename to lib/tests/scaffold/48-global-static.c
diff --git a/scaffold/tests/51-pointer-sub.c b/lib/tests/scaffold/51-pointer-sub.c
similarity index 100%
rename from scaffold/tests/51-pointer-sub.c
rename to lib/tests/scaffold/51-pointer-sub.c
diff --git a/scaffold/tests/54-argc.c b/lib/tests/scaffold/54-argc.c
similarity index 100%
rename from scaffold/tests/54-argc.c
rename to lib/tests/scaffold/54-argc.c
diff --git a/scaffold/tests/54-argv.c b/lib/tests/scaffold/54-argv.c
similarity index 92%
rename from scaffold/tests/54-argv.c
rename to lib/tests/scaffold/54-argv.c
index 7b9965e4..2d892ac6 100644
--- a/scaffold/tests/54-argv.c
+++ b/lib/tests/scaffold/54-argv.c
@@ -27,11 +27,11 @@ int
 main (int argc, char *argv[])
 {
   oputs ("\n");
-  oputs ("t: argv[0] == \"scaffold/test....\"\n");
+  oputs ("t: argv[0] == \"test/scaffold....\"\n");
   oputs ("argv0=");
   oputs (argv[0]);
   oputs ("\n");
-  if (strncmp (argv[0], "scaffold/test", 5))
+  if (strncmp (argv[0], "test/scaffold", 5))
     return 1;
 
   oputs ("t: *argv\"\n");
diff --git a/scaffold/tests/55-char-array.c b/lib/tests/scaffold/55-char-array.c
similarity index 100%
rename from scaffold/tests/55-char-array.c
rename to lib/tests/scaffold/55-char-array.c
diff --git a/scaffold/tests/60-math.c b/lib/tests/scaffold/60-math.c
similarity index 100%
rename from scaffold/tests/60-math.c
rename to lib/tests/scaffold/60-math.c
diff --git a/scaffold/tests/61-array.c b/lib/tests/scaffold/61-array.c
similarity index 100%
rename from scaffold/tests/61-array.c
rename to lib/tests/scaffold/61-array.c
diff --git a/scaffold/tests/62-array.c b/lib/tests/scaffold/62-array.c
similarity index 100%
rename from scaffold/tests/62-array.c
rename to lib/tests/scaffold/62-array.c
diff --git a/scaffold/tests/63-struct-array-assign.c b/lib/tests/scaffold/63-struct-array-assign.c
similarity index 100%
rename from scaffold/tests/63-struct-array-assign.c
rename to lib/tests/scaffold/63-struct-array-assign.c
diff --git a/scaffold/tests/63-struct-array-compare.c b/lib/tests/scaffold/63-struct-array-compare.c
similarity index 100%
rename from scaffold/tests/63-struct-array-compare.c
rename to lib/tests/scaffold/63-struct-array-compare.c
diff --git a/scaffold/tests/63-struct-array.c b/lib/tests/scaffold/63-struct-array.c
similarity index 100%
rename from scaffold/tests/63-struct-array.c
rename to lib/tests/scaffold/63-struct-array.c
diff --git a/scaffold/tests/63-struct-assign.c b/lib/tests/scaffold/63-struct-assign.c
similarity index 100%
rename from scaffold/tests/63-struct-assign.c
rename to lib/tests/scaffold/63-struct-assign.c
diff --git a/scaffold/tests/63-struct-cell.c b/lib/tests/scaffold/63-struct-cell.c
similarity index 100%
rename from scaffold/tests/63-struct-cell.c
rename to lib/tests/scaffold/63-struct-cell.c
diff --git a/scaffold/tests/63-struct-function.c b/lib/tests/scaffold/63-struct-function.c
similarity index 100%
rename from scaffold/tests/63-struct-function.c
rename to lib/tests/scaffold/63-struct-function.c
diff --git a/scaffold/tests/63-struct-local.c b/lib/tests/scaffold/63-struct-local.c
similarity index 100%
rename from scaffold/tests/63-struct-local.c
rename to lib/tests/scaffold/63-struct-local.c
diff --git a/scaffold/tests/63-struct-pointer.c b/lib/tests/scaffold/63-struct-pointer.c
similarity index 100%
rename from scaffold/tests/63-struct-pointer.c
rename to lib/tests/scaffold/63-struct-pointer.c
diff --git a/scaffold/tests/63-struct.c b/lib/tests/scaffold/63-struct.c
similarity index 100%
rename from scaffold/tests/63-struct.c
rename to lib/tests/scaffold/63-struct.c
diff --git a/scaffold/tests/64-make-cell.c b/lib/tests/scaffold/64-make-cell.c
similarity index 100%
rename from scaffold/tests/64-make-cell.c
rename to lib/tests/scaffold/64-make-cell.c
diff --git a/scaffold/tests/65-read.c b/lib/tests/scaffold/65-read.c
similarity index 100%
rename from scaffold/tests/65-read.c
rename to lib/tests/scaffold/65-read.c
diff --git a/scaffold/tests/66-local-char-array.c b/lib/tests/scaffold/66-local-char-array.c
similarity index 100%
rename from scaffold/tests/66-local-char-array.c
rename to lib/tests/scaffold/66-local-char-array.c
diff --git a/scaffold/tests/70-stdarg.c b/lib/tests/scaffold/70-stdarg.c
similarity index 100%
rename from scaffold/tests/70-stdarg.c
rename to lib/tests/scaffold/70-stdarg.c
diff --git a/scaffold/tests/71-struct-array.c b/lib/tests/scaffold/71-struct-array.c
similarity index 100%
rename from scaffold/tests/71-struct-array.c
rename to lib/tests/scaffold/71-struct-array.c
diff --git a/scaffold/tests/72-typedef-struct-def.c b/lib/tests/scaffold/72-typedef-struct-def.c
similarity index 100%
rename from scaffold/tests/72-typedef-struct-def.c
rename to lib/tests/scaffold/72-typedef-struct-def.c
diff --git a/scaffold/tests/73-union-hello.c b/lib/tests/scaffold/73-union-hello.c
similarity index 100%
rename from scaffold/tests/73-union-hello.c
rename to lib/tests/scaffold/73-union-hello.c
diff --git a/scaffold/tests/73-union.c b/lib/tests/scaffold/73-union.c
similarity index 100%
rename from scaffold/tests/73-union.c
rename to lib/tests/scaffold/73-union.c
diff --git a/scaffold/tests/74-multi-line-string.c b/lib/tests/scaffold/74-multi-line-string.c
similarity index 100%
rename from scaffold/tests/74-multi-line-string.c
rename to lib/tests/scaffold/74-multi-line-string.c
diff --git a/scaffold/tests/75-struct-union.c b/lib/tests/scaffold/75-struct-union.c
similarity index 100%
rename from scaffold/tests/75-struct-union.c
rename to lib/tests/scaffold/75-struct-union.c
diff --git a/scaffold/tests/76-pointer-arithmetic-pp.c b/lib/tests/scaffold/76-pointer-arithmetic-pp.c
similarity index 100%
rename from scaffold/tests/76-pointer-arithmetic-pp.c
rename to lib/tests/scaffold/76-pointer-arithmetic-pp.c
diff --git a/scaffold/tests/76-pointer-arithmetic.c b/lib/tests/scaffold/76-pointer-arithmetic.c
similarity index 100%
rename from scaffold/tests/76-pointer-arithmetic.c
rename to lib/tests/scaffold/76-pointer-arithmetic.c
diff --git a/scaffold/tests/77-pointer-assign.c b/lib/tests/scaffold/77-pointer-assign.c
similarity index 100%
rename from scaffold/tests/77-pointer-assign.c
rename to lib/tests/scaffold/77-pointer-assign.c
diff --git a/scaffold/tests/78-union-struct.c b/lib/tests/scaffold/78-union-struct.c
similarity index 100%
rename from scaffold/tests/78-union-struct.c
rename to lib/tests/scaffold/78-union-struct.c
diff --git a/scaffold/tests/79-int-array-simple.c b/lib/tests/scaffold/79-int-array-simple.c
similarity index 100%
rename from scaffold/tests/79-int-array-simple.c
rename to lib/tests/scaffold/79-int-array-simple.c
diff --git a/scaffold/tests/79-int-array.c b/lib/tests/scaffold/79-int-array.c
similarity index 100%
rename from scaffold/tests/79-int-array.c
rename to lib/tests/scaffold/79-int-array.c
diff --git a/scaffold/tests/7a-struct-char-array.c b/lib/tests/scaffold/7a-struct-char-array.c
similarity index 100%
rename from scaffold/tests/7a-struct-char-array.c
rename to lib/tests/scaffold/7a-struct-char-array.c
diff --git a/scaffold/tests/7b-struct-int-array-hello.c b/lib/tests/scaffold/7b-struct-int-array-hello.c
similarity index 100%
rename from scaffold/tests/7b-struct-int-array-hello.c
rename to lib/tests/scaffold/7b-struct-int-array-hello.c
diff --git a/scaffold/tests/7b-struct-int-array-pointer.c b/lib/tests/scaffold/7b-struct-int-array-pointer.c
similarity index 100%
rename from scaffold/tests/7b-struct-int-array-pointer.c
rename to lib/tests/scaffold/7b-struct-int-array-pointer.c
diff --git a/scaffold/tests/7b-struct-int-array.c b/lib/tests/scaffold/7b-struct-int-array.c
similarity index 100%
rename from scaffold/tests/7b-struct-int-array.c
rename to lib/tests/scaffold/7b-struct-int-array.c
diff --git a/scaffold/tests/7c-dynarray.c b/lib/tests/scaffold/7c-dynarray.c
similarity index 100%
rename from scaffold/tests/7c-dynarray.c
rename to lib/tests/scaffold/7c-dynarray.c
diff --git a/scaffold/tests/7d-cast-char.c b/lib/tests/scaffold/7d-cast-char.c
similarity index 100%
rename from scaffold/tests/7d-cast-char.c
rename to lib/tests/scaffold/7d-cast-char.c
diff --git a/scaffold/tests/7e-struct-array-access.c b/lib/tests/scaffold/7e-struct-array-access.c
similarity index 100%
rename from scaffold/tests/7e-struct-array-access.c
rename to lib/tests/scaffold/7e-struct-array-access.c
diff --git a/scaffold/tests/7f-struct-pointer-arithmetic.c b/lib/tests/scaffold/7f-struct-pointer-arithmetic.c
similarity index 100%
rename from scaffold/tests/7f-struct-pointer-arithmetic.c
rename to lib/tests/scaffold/7f-struct-pointer-arithmetic.c
diff --git a/scaffold/tests/7g-struct-byte-word-field.c b/lib/tests/scaffold/7g-struct-byte-word-field.c
similarity index 100%
rename from scaffold/tests/7g-struct-byte-word-field.c
rename to lib/tests/scaffold/7g-struct-byte-word-field.c
diff --git a/scaffold/tests/7h-struct-assign.c b/lib/tests/scaffold/7h-struct-assign.c
similarity index 100%
rename from scaffold/tests/7h-struct-assign.c
rename to lib/tests/scaffold/7h-struct-assign.c
diff --git a/scaffold/tests/7i-struct-struct-simple.c b/lib/tests/scaffold/7i-struct-struct-simple.c
similarity index 100%
rename from scaffold/tests/7i-struct-struct-simple.c
rename to lib/tests/scaffold/7i-struct-struct-simple.c
diff --git a/scaffold/tests/7i-struct-struct.c b/lib/tests/scaffold/7i-struct-struct.c
similarity index 100%
rename from scaffold/tests/7i-struct-struct.c
rename to lib/tests/scaffold/7i-struct-struct.c
diff --git a/scaffold/tests/7k-empty-for.c b/lib/tests/scaffold/7k-empty-for.c
similarity index 100%
rename from scaffold/tests/7k-empty-for.c
rename to lib/tests/scaffold/7k-empty-for.c
diff --git a/scaffold/tests/7k-for-each-elem-simple.c b/lib/tests/scaffold/7k-for-each-elem-simple.c
similarity index 100%
rename from scaffold/tests/7k-for-each-elem-simple.c
rename to lib/tests/scaffold/7k-for-each-elem-simple.c
diff --git a/scaffold/tests/7k-for-each-elem.c b/lib/tests/scaffold/7k-for-each-elem.c
similarity index 100%
rename from scaffold/tests/7k-for-each-elem.c
rename to lib/tests/scaffold/7k-for-each-elem.c
diff --git a/scaffold/tests/7l-struct-any-size-array-simple.c b/lib/tests/scaffold/7l-struct-any-size-array-simple.c
similarity index 100%
rename from scaffold/tests/7l-struct-any-size-array-simple.c
rename to lib/tests/scaffold/7l-struct-any-size-array-simple.c
diff --git a/scaffold/tests/7l-struct-any-size-array.c b/lib/tests/scaffold/7l-struct-any-size-array.c
similarity index 100%
rename from scaffold/tests/7l-struct-any-size-array.c
rename to lib/tests/scaffold/7l-struct-any-size-array.c
diff --git a/scaffold/tests/7m-struct-char-array-assign.c b/lib/tests/scaffold/7m-struct-char-array-assign.c
similarity index 100%
rename from scaffold/tests/7m-struct-char-array-assign.c
rename to lib/tests/scaffold/7m-struct-char-array-assign.c
diff --git a/scaffold/tests/7n-struct-struct-array.c b/lib/tests/scaffold/7n-struct-struct-array.c
similarity index 100%
rename from scaffold/tests/7n-struct-struct-array.c
rename to lib/tests/scaffold/7n-struct-struct-array.c
diff --git a/scaffold/tests/7o-struct-pre-post-simple.c b/lib/tests/scaffold/7o-struct-pre-post-simple.c
similarity index 100%
rename from scaffold/tests/7o-struct-pre-post-simple.c
rename to lib/tests/scaffold/7o-struct-pre-post-simple.c
diff --git a/scaffold/tests/7o-struct-pre-post.c b/lib/tests/scaffold/7o-struct-pre-post.c
similarity index 100%
rename from scaffold/tests/7o-struct-pre-post.c
rename to lib/tests/scaffold/7o-struct-pre-post.c
diff --git a/scaffold/tests/7p-struct-cast.c b/lib/tests/scaffold/7p-struct-cast.c
similarity index 100%
rename from scaffold/tests/7p-struct-cast.c
rename to lib/tests/scaffold/7p-struct-cast.c
diff --git a/scaffold/tests/7q-bit-field-simple.c b/lib/tests/scaffold/7q-bit-field-simple.c
similarity index 100%
rename from scaffold/tests/7q-bit-field-simple.c
rename to lib/tests/scaffold/7q-bit-field-simple.c
diff --git a/scaffold/tests/7q-bit-field.c b/lib/tests/scaffold/7q-bit-field.c
similarity index 100%
rename from scaffold/tests/7q-bit-field.c
rename to lib/tests/scaffold/7q-bit-field.c
diff --git a/scaffold/tests/7r-sign-extend.c b/lib/tests/scaffold/7r-sign-extend.c
similarity index 100%
rename from scaffold/tests/7r-sign-extend.c
rename to lib/tests/scaffold/7r-sign-extend.c
diff --git a/scaffold/tests/7s-struct-short.c b/lib/tests/scaffold/7s-struct-short.c
similarity index 100%
rename from scaffold/tests/7s-struct-short.c
rename to lib/tests/scaffold/7s-struct-short.c
diff --git a/scaffold/tests/7s-unsigned-compare.c b/lib/tests/scaffold/7s-unsigned-compare.c
similarity index 100%
rename from scaffold/tests/7s-unsigned-compare.c
rename to lib/tests/scaffold/7s-unsigned-compare.c
diff --git a/scaffold/tests/7t-function-destruct.c b/lib/tests/scaffold/7t-function-destruct.c
similarity index 100%
rename from scaffold/tests/7t-function-destruct.c
rename to lib/tests/scaffold/7t-function-destruct.c
diff --git a/scaffold/tests/7u-call-ternary.c b/lib/tests/scaffold/7u-call-ternary.c
similarity index 100%
rename from scaffold/tests/7u-call-ternary.c
rename to lib/tests/scaffold/7u-call-ternary.c
diff --git a/scaffold/tests/7u-double.c b/lib/tests/scaffold/7u-double.c
similarity index 100%
rename from scaffold/tests/7u-double.c
rename to lib/tests/scaffold/7u-double.c
diff --git a/scaffold/tests/7u-inc-byte-word.c b/lib/tests/scaffold/7u-inc-byte-word.c
similarity index 100%
rename from scaffold/tests/7u-inc-byte-word.c
rename to lib/tests/scaffold/7u-inc-byte-word.c
diff --git a/scaffold/tests/7u-long-long.c b/lib/tests/scaffold/7u-long-long.c
similarity index 100%
rename from scaffold/tests/7u-long-long.c
rename to lib/tests/scaffold/7u-long-long.c
diff --git a/scaffold/tests/7u-struct-func.c b/lib/tests/scaffold/7u-struct-func.c
similarity index 100%
rename from scaffold/tests/7u-struct-func.c
rename to lib/tests/scaffold/7u-struct-func.c
diff --git a/scaffold/tests/7u-struct-size10.c b/lib/tests/scaffold/7u-struct-size10.c
similarity index 100%
rename from scaffold/tests/7u-struct-size10.c
rename to lib/tests/scaffold/7u-struct-size10.c
diff --git a/scaffold/tests/7u-ternary-expression.c b/lib/tests/scaffold/7u-ternary-expression.c
similarity index 100%
rename from scaffold/tests/7u-ternary-expression.c
rename to lib/tests/scaffold/7u-ternary-expression.c
diff --git a/scaffold/tests/7u-vstack.c b/lib/tests/scaffold/7u-vstack.c
similarity index 100%
rename from scaffold/tests/7u-vstack.c
rename to lib/tests/scaffold/7u-vstack.c
diff --git a/scaffold/tests/82-define.c b/lib/tests/scaffold/82-define.c
similarity index 100%
rename from scaffold/tests/82-define.c
rename to lib/tests/scaffold/82-define.c
diff --git a/scaffold/tests/83-heterogenoous-init.c b/lib/tests/scaffold/83-heterogenoous-init.c
similarity index 100%
rename from scaffold/tests/83-heterogenoous-init.c
rename to lib/tests/scaffold/83-heterogenoous-init.c
diff --git a/scaffold/tests/84-struct-field-list.c b/lib/tests/scaffold/84-struct-field-list.c
similarity index 100%
rename from scaffold/tests/84-struct-field-list.c
rename to lib/tests/scaffold/84-struct-field-list.c
diff --git a/scaffold/tests/85-sizeof.c b/lib/tests/scaffold/85-sizeof.c
similarity index 100%
rename from scaffold/tests/85-sizeof.c
rename to lib/tests/scaffold/85-sizeof.c
diff --git a/scaffold/tests/90-goto-var.c b/lib/tests/scaffold/90-goto-var.c
similarity index 100%
rename from scaffold/tests/90-goto-var.c
rename to lib/tests/scaffold/90-goto-var.c
diff --git a/scaffold/tests/91-goto-array.c b/lib/tests/scaffold/91-goto-array.c
similarity index 100%
rename from scaffold/tests/91-goto-array.c
rename to lib/tests/scaffold/91-goto-array.c
diff --git a/scaffold/tests/a0-call-trunc-char.c b/lib/tests/scaffold/a0-call-trunc-char.c
similarity index 100%
rename from scaffold/tests/a0-call-trunc-char.c
rename to lib/tests/scaffold/a0-call-trunc-char.c
diff --git a/scaffold/tests/a0-call-trunc-int.c b/lib/tests/scaffold/a0-call-trunc-int.c
similarity index 100%
rename from scaffold/tests/a0-call-trunc-int.c
rename to lib/tests/scaffold/a0-call-trunc-int.c
diff --git a/scaffold/tests/a0-call-trunc-short.c b/lib/tests/scaffold/a0-call-trunc-short.c
similarity index 100%
rename from scaffold/tests/a0-call-trunc-short.c
rename to lib/tests/scaffold/a0-call-trunc-short.c
diff --git a/scaffold/tests/a0-math-divide-signed-negative.c b/lib/tests/scaffold/a0-math-divide-signed-negative.c
similarity index 100%
rename from scaffold/tests/a0-math-divide-signed-negative.c
rename to lib/tests/scaffold/a0-math-divide-signed-negative.c
diff --git a/scaffold/tests/a1-global-no-align.c b/lib/tests/scaffold/a1-global-no-align.c
similarity index 100%
rename from scaffold/tests/a1-global-no-align.c
rename to lib/tests/scaffold/a1-global-no-align.c
diff --git a/scaffold/tests/a1-global-no-clobber.c b/lib/tests/scaffold/a1-global-no-clobber.c
similarity index 100%
rename from scaffold/tests/a1-global-no-clobber.c
rename to lib/tests/scaffold/a1-global-no-clobber.c
diff --git a/scaffold/tests/exit-42.i b/lib/tests/scaffold/exit-42.i
similarity index 100%
rename from scaffold/tests/exit-42.i
rename to lib/tests/scaffold/exit-42.i
diff --git a/scaffold/tests/t.c b/lib/tests/scaffold/t.c
similarity index 98%
rename from scaffold/tests/t.c
rename to lib/tests/scaffold/t.c
index 13149857..7e9eafd3 100644
--- a/scaffold/tests/t.c
+++ b/lib/tests/scaffold/t.c
@@ -139,7 +139,7 @@ main (int argc, char *argv[])
     return 9;
   if (TCHAR != 0)
     return 11;
-  if (strncmp (argv[0], "scaffold/test", 5))
+  if (strncmp (argv[0], "test/scaffold", 5))
     return 12;
   if (strcmp (env[0], "foo"))
     return 13;
diff --git a/lib/tests/stdio/80-sscanf.c b/lib/tests/stdio/80-sscanf.c
index 4c7c7ccc..927c9f42 100644
--- a/lib/tests/stdio/80-sscanf.c
+++ b/lib/tests/stdio/80-sscanf.c
@@ -26,9 +26,6 @@
 int
 main ()
 {
-#if __GNUC__ && __x86_64__ && !SYSTEM_LIBC
-  return 0;
-#endif
   int i;
   int r = sscanf ("42", "%d", &i);
   if (r != 1)
diff --git a/lib/tests/stdio/90-fseek.c b/lib/tests/stdio/90-fseek.c
index b776c1dd..8d204f05 100644
--- a/lib/tests/stdio/90-fseek.c
+++ b/lib/tests/stdio/90-fseek.c
@@ -27,7 +27,7 @@
 int
 main ()
 {
-  int fd = open ("COPYING", 0);
+  int fd = open ("../COPYING", 0);
   if (fd <= 0)
     return 1;
   FILE *f = fdopen (fd, "r");