diff --git a/c/brlib/Makefile b/Makefile
similarity index 100%
rename from c/brlib/Makefile
rename to Makefile
diff --git a/c/brlib/include/bits.h b/include/bits.h
similarity index 100%
rename from c/brlib/include/bits.h
rename to include/bits.h
diff --git a/c/brlib/include/br.h b/include/br.h
similarity index 100%
rename from c/brlib/include/br.h
rename to include/br.h
diff --git a/c/brlib/include/bug.h b/include/bug.h
similarity index 100%
rename from c/brlib/include/bug.h
rename to include/bug.h
diff --git a/c/brlib/include/container-of.h b/include/container-of.h
similarity index 100%
rename from c/brlib/include/container-of.h
rename to include/container-of.h
diff --git a/c/brlib/include/debug.h b/include/debug.h
similarity index 100%
rename from c/brlib/include/debug.h
rename to include/debug.h
diff --git a/c/brlib/include/hash.h b/include/hash.h
similarity index 100%
rename from c/brlib/include/hash.h
rename to include/hash.h
diff --git a/c/brlib/include/hashtable.h b/include/hashtable.h
similarity index 100%
rename from c/brlib/include/hashtable.h
rename to include/hashtable.h
diff --git a/c/brlib/include/likely.h b/include/likely.h
similarity index 100%
rename from c/brlib/include/likely.h
rename to include/likely.h
diff --git a/c/brlib/include/list.h b/include/list.h
similarity index 100%
rename from c/brlib/include/list.h
rename to include/list.h
diff --git a/c/brlib/include/pjwhash-inline.h b/include/pjwhash-inline.h
similarity index 100%
rename from c/brlib/include/pjwhash-inline.h
rename to include/pjwhash-inline.h
diff --git a/c/brlib/include/pjwhash.h b/include/pjwhash.h
similarity index 100%
rename from c/brlib/include/pjwhash.h
rename to include/pjwhash.h
diff --git a/c/brlib/include/plist.h b/include/plist.h
similarity index 100%
rename from c/brlib/include/plist.h
rename to include/plist.h
diff --git a/c/brlib/include/pool.h b/include/pool.h
similarity index 100%
rename from c/brlib/include/pool.h
rename to include/pool.h
diff --git a/c/brlib/include/rwonce.h b/include/rwonce.h
similarity index 100%
rename from c/brlib/include/rwonce.h
rename to include/rwonce.h
diff --git a/c/brlib/include/stringhash.h b/include/stringhash.h
similarity index 100%
rename from c/brlib/include/stringhash.h
rename to include/stringhash.h
diff --git a/c/brlib/include/struct-group.h b/include/struct-group.h
similarity index 100%
rename from c/brlib/include/struct-group.h
rename to include/struct-group.h
diff --git a/c/brlib/src/bits.c b/src/bits.c
similarity index 100%
rename from c/brlib/src/bits.c
rename to src/bits.c
diff --git a/c/brlib/src/debug.c b/src/debug.c
similarity index 100%
rename from c/brlib/src/debug.c
rename to src/debug.c
diff --git a/c/brlib/src/hash.c b/src/hash.c
similarity index 100%
rename from c/brlib/src/hash.c
rename to src/hash.c
diff --git a/c/brlib/src/pjwhash.c b/src/pjwhash.c
similarity index 100%
rename from c/brlib/src/pjwhash.c
rename to src/pjwhash.c
diff --git a/c/brlib/src/plist.c b/src/plist.c
similarity index 100%
rename from c/brlib/src/plist.c
rename to src/plist.c
diff --git a/c/brlib/src/pool.c b/src/pool.c
similarity index 100%
rename from c/brlib/src/pool.c
rename to src/pool.c
diff --git a/c/brlib/test/test/tst-debug.c b/test/test/tst-debug.c
similarity index 100%
rename from c/brlib/test/test/tst-debug.c
rename to test/test/tst-debug.c
diff --git a/c/brlib/test/tst-pool.c b/test/tst-pool.c
similarity index 100%
rename from c/brlib/test/tst-pool.c
rename to test/tst-pool.c
diff --git a/c/brlib/todo/asm/unaligned.h b/todo/asm/unaligned.h
similarity index 100%
rename from c/brlib/todo/asm/unaligned.h
rename to todo/asm/unaligned.h
diff --git a/c/brlib/todo/circ_buf.c b/todo/circ_buf.c
similarity index 100%
rename from c/brlib/todo/circ_buf.c
rename to todo/circ_buf.c
diff --git a/c/brlib/todo/circ_buf.h b/todo/circ_buf.h
similarity index 100%
rename from c/brlib/todo/circ_buf.h
rename to todo/circ_buf.h
diff --git a/c/brlib/todo/hashtest.c b/todo/hashtest.c
similarity index 100%
rename from c/brlib/todo/hashtest.c
rename to todo/hashtest.c
diff --git a/c/brlib/todo/list_sort.c b/todo/list_sort.c
similarity index 100%
rename from c/brlib/todo/list_sort.c
rename to todo/list_sort.c
diff --git a/c/brlib/todo/list_sort.h b/todo/list_sort.h
similarity index 100%
rename from c/brlib/todo/list_sort.h
rename to todo/list_sort.h
diff --git a/c/brlib/todo/packed_struct.h b/todo/packed_struct.h
similarity index 100%
rename from c/brlib/todo/packed_struct.h
rename to todo/packed_struct.h
diff --git a/c/brlib/todo/xxhash.c b/todo/xxhash.c
similarity index 100%
rename from c/brlib/todo/xxhash.c
rename to todo/xxhash.c
diff --git a/c/brlib/todo/xxhash.h b/todo/xxhash.h
similarity index 100%
rename from c/brlib/todo/xxhash.h
rename to todo/xxhash.h