fs layout updated

89 files changed, 4 insertions, 4 deletions

diff --git a/code/Makefile b/code/core/Makefile
index be1a827..d3610bf 100644
--- a/code/Makefile
+++ b/code/core/Makefile
@@ -1,12 +1,12 @@
 MAKE=make
 CFLAGS = -I. -pthread -O3 -DECP_DEBUG
 obj = core.o timer.o msgq.o
-subdirs = crypto posix htable test
+subdirs = crypto posix htable
 
 %.o: %.c %.h
 	$(CC) $(CFLAGS) -c $<
 
-all: $(obj) init.o init_proxy.o
+all: $(obj)
 	$(AR) rcs libecpcore.a $(obj)
 	for i in $(subdirs); do \
 		(cd $$i && $(MAKE) && cd ..) || exit; \
diff --git a/code/TODO b/code/core/TODO
index ade028d..ade028d 100644
--- a/code/TODO
+++ b/code/core/TODO
diff --git a/code/config.h b/code/core/config.h
index 83108a6..83108a6 100644
--- a/code/config.h
+++ b/code/core/config.h
diff --git a/code/core.c b/code/core/core.c
index ed083a0..ed083a0 100644
--- a/code/core.c
+++ b/code/core/core.c
diff --git a/code/core.h b/code/core/core.h
index 33dd6d2..33dd6d2 100644
--- a/code/core.h
+++ b/code/core/core.h
diff --git a/code/crypto/Makefile b/code/core/crypto/Makefile
index cfd3bf8..cfd3bf8 100644
--- a/code/crypto/Makefile
+++ b/code/core/crypto/Makefile
diff --git a/code/crypto/chacha/Makefile b/code/core/crypto/chacha/Makefile
index dae3373..dae3373 100644
--- a/code/crypto/chacha/Makefile
+++ b/code/core/crypto/chacha/Makefile
diff --git a/code/crypto/chacha/chacha-merged.c b/code/core/crypto/chacha/chacha-merged.c
index 557dfd5..557dfd5 100644
--- a/code/crypto/chacha/chacha-merged.c
+++ b/code/core/crypto/chacha/chacha-merged.c
diff --git a/code/crypto/chacha/chacha.c b/code/core/crypto/chacha/chacha.c
index fba03c9..fba03c9 100644
--- a/code/crypto/chacha/chacha.c
+++ b/code/core/crypto/chacha/chacha.c
diff --git a/code/crypto/compat/Makefile b/code/core/crypto/compat/Makefile
index 2c0fa5c..2c0fa5c 100644
--- a/code/crypto/compat/Makefile
+++ b/code/core/crypto/compat/Makefile
diff --git a/code/crypto/compat/arc4random.c b/code/core/crypto/compat/arc4random.c
index 0d3a64f..0d3a64f 100644
--- a/code/crypto/compat/arc4random.c
+++ b/code/core/crypto/compat/arc4random.c
diff --git a/code/crypto/compat/arc4random.h b/code/core/crypto/compat/arc4random.h
index 762aec2..762aec2 100644
--- a/code/crypto/compat/arc4random.h
+++ b/code/core/crypto/compat/arc4random.h
diff --git a/code/crypto/compat/arc4random_aix.h b/code/core/crypto/compat/arc4random_aix.h
index 3142a1f..3142a1f 100644
--- a/code/crypto/compat/arc4random_aix.h
+++ b/code/core/crypto/compat/arc4random_aix.h
diff --git a/code/crypto/compat/arc4random_freebsd.h b/code/core/crypto/compat/arc4random_freebsd.h
index 3faa5e4..3faa5e4 100644
--- a/code/crypto/compat/arc4random_freebsd.h
+++ b/code/core/crypto/compat/arc4random_freebsd.h
diff --git a/code/crypto/compat/arc4random_hpux.h b/code/core/crypto/compat/arc4random_hpux.h
index 2a3fe8c..2a3fe8c 100644
--- a/code/crypto/compat/arc4random_hpux.h
+++ b/code/core/crypto/compat/arc4random_hpux.h
diff --git a/code/crypto/compat/arc4random_linux.h b/code/core/crypto/compat/arc4random_linux.h
index 879f966..879f966 100644
--- a/code/crypto/compat/arc4random_linux.h
+++ b/code/core/crypto/compat/arc4random_linux.h
diff --git a/code/crypto/compat/arc4random_netbsd.h b/code/core/crypto/compat/arc4random_netbsd.h
index 611997d..611997d 100644
--- a/code/crypto/compat/arc4random_netbsd.h
+++ b/code/core/crypto/compat/arc4random_netbsd.h
diff --git a/code/crypto/compat/arc4random_osx.h b/code/core/crypto/compat/arc4random_osx.h
index 818ae6b..818ae6b 100644
--- a/code/crypto/compat/arc4random_osx.h
+++ b/code/core/crypto/compat/arc4random_osx.h
diff --git a/code/crypto/compat/arc4random_solaris.h b/code/core/crypto/compat/arc4random_solaris.h
index b1084cd..b1084cd 100644
--- a/code/crypto/compat/arc4random_solaris.h
+++ b/code/core/crypto/compat/arc4random_solaris.h
diff --git a/code/crypto/compat/arc4random_uniform.c b/code/core/crypto/compat/arc4random_uniform.c
index 2d22434..2d22434 100644
--- a/code/crypto/compat/arc4random_uniform.c
+++ b/code/core/crypto/compat/arc4random_uniform.c
diff --git a/code/crypto/compat/arc4random_win.h b/code/core/crypto/compat/arc4random_win.h
index deec8a1..deec8a1 100644
--- a/code/crypto/compat/arc4random_win.h
+++ b/code/core/crypto/compat/arc4random_win.h
diff --git a/code/crypto/compat/chacha_private.h b/code/core/crypto/compat/chacha_private.h
index 7c3680f..7c3680f 100644
--- a/code/crypto/compat/chacha_private.h
+++ b/code/core/crypto/compat/chacha_private.h
diff --git a/code/crypto/compat/explicit_bzero.c b/code/core/crypto/compat/explicit_bzero.c
index 5dd0103..5dd0103 100644
--- a/code/crypto/compat/explicit_bzero.c
+++ b/code/core/crypto/compat/explicit_bzero.c
diff --git a/code/crypto/compat/getentropy_aix.c b/code/core/crypto/compat/getentropy_aix.c
index b046412..b046412 100644
--- a/code/crypto/compat/getentropy_aix.c
+++ b/code/core/crypto/compat/getentropy_aix.c
diff --git a/code/crypto/compat/getentropy_freebsd.c b/code/core/crypto/compat/getentropy_freebsd.c
index 30cd68e..30cd68e 100644
--- a/code/crypto/compat/getentropy_freebsd.c
+++ b/code/core/crypto/compat/getentropy_freebsd.c
diff --git a/code/crypto/compat/getentropy_hpux.c b/code/core/crypto/compat/getentropy_hpux.c
index a74e53c..a74e53c 100644
--- a/code/crypto/compat/getentropy_hpux.c
+++ b/code/core/crypto/compat/getentropy_hpux.c
diff --git a/code/crypto/compat/getentropy_linux.c b/code/core/crypto/compat/getentropy_linux.c
index 37362e9..37362e9 100644
--- a/code/crypto/compat/getentropy_linux.c
+++ b/code/core/crypto/compat/getentropy_linux.c
diff --git a/code/crypto/compat/getentropy_netbsd.c b/code/core/crypto/compat/getentropy_netbsd.c
index 45d68c9..45d68c9 100644
--- a/code/crypto/compat/getentropy_netbsd.c
+++ b/code/core/crypto/compat/getentropy_netbsd.c
diff --git a/code/crypto/compat/getentropy_osx.c b/code/core/crypto/compat/getentropy_osx.c
index 44a313c..44a313c 100644
--- a/code/crypto/compat/getentropy_osx.c
+++ b/code/core/crypto/compat/getentropy_osx.c
diff --git a/code/crypto/compat/getentropy_solaris.c b/code/core/crypto/compat/getentropy_solaris.c
index 017a2cf..017a2cf 100644
--- a/code/crypto/compat/getentropy_solaris.c
+++ b/code/core/crypto/compat/getentropy_solaris.c
diff --git a/code/crypto/compat/getentropy_win.c b/code/core/crypto/compat/getentropy_win.c
index 2abeb27..2abeb27 100644
--- a/code/crypto/compat/getentropy_win.c
+++ b/code/core/crypto/compat/getentropy_win.c
diff --git a/code/crypto/compat/timingsafe_bcmp.c b/code/core/crypto/compat/timingsafe_bcmp.c
index 552e844..552e844 100644
--- a/code/crypto/compat/timingsafe_bcmp.c
+++ b/code/core/crypto/compat/timingsafe_bcmp.c
diff --git a/code/crypto/compat/timingsafe_memcmp.c b/code/core/crypto/compat/timingsafe_memcmp.c
index bb210a3..bb210a3 100644
--- a/code/crypto/compat/timingsafe_memcmp.c
+++ b/code/core/crypto/compat/timingsafe_memcmp.c
diff --git a/code/crypto/crypto.c b/code/core/crypto/crypto.c
index f57e8d8..f57e8d8 100644
--- a/code/crypto/crypto.c
+++ b/code/core/crypto/crypto.c
diff --git a/code/crypto/crypto.h b/code/core/crypto/crypto.h
index 7bd27d5..7bd27d5 100644
--- a/code/crypto/crypto.h
+++ b/code/core/crypto/crypto.h
diff --git a/code/crypto/curve25519/Makefile b/code/core/crypto/curve25519/Makefile
index 470d31e..470d31e 100644
--- a/code/crypto/curve25519/Makefile
+++ b/code/core/crypto/curve25519/Makefile
diff --git a/code/crypto/curve25519/curve25519-generic.c b/code/core/crypto/curve25519/curve25519-generic.c
index e7373d2..e7373d2 100644
--- a/code/crypto/curve25519/curve25519-generic.c
+++ b/code/core/crypto/curve25519/curve25519-generic.c
diff --git a/code/crypto/curve25519/curve25519.c b/code/core/crypto/curve25519/curve25519.c
index f5f57e6..f5f57e6 100644
--- a/code/crypto/curve25519/curve25519.c
+++ b/code/core/crypto/curve25519/curve25519.c
diff --git a/code/crypto/curve25519/curve25519_internal.h b/code/core/crypto/curve25519/curve25519_internal.h
index f80424a..f80424a 100644
--- a/code/crypto/curve25519/curve25519_internal.h
+++ b/code/core/crypto/curve25519/curve25519_internal.h
diff --git a/code/crypto/e_chacha20poly1305.c b/code/core/crypto/e_chacha20poly1305.c
index 17fcab8..17fcab8 100644
--- a/code/crypto/e_chacha20poly1305.c
+++ b/code/core/crypto/e_chacha20poly1305.c
diff --git a/code/crypto/include/chacha.h b/code/core/crypto/include/chacha.h
index 11885b7..11885b7 100644
--- a/code/crypto/include/chacha.h
+++ b/code/core/crypto/include/chacha.h
diff --git a/code/crypto/include/compat.h b/code/core/crypto/include/compat.h
index 12fb3f4..12fb3f4 100644
--- a/code/crypto/include/compat.h
+++ b/code/core/crypto/include/compat.h
diff --git a/code/crypto/include/curve25519.h b/code/core/crypto/include/curve25519.h
index a7092cb..a7092cb 100644
--- a/code/crypto/include/curve25519.h
+++ b/code/core/crypto/include/curve25519.h
diff --git a/code/crypto/include/machine/endian.h b/code/core/crypto/include/machine/endian.h
index 5ec39af..5ec39af 100644
--- a/code/crypto/include/machine/endian.h
+++ b/code/core/crypto/include/machine/endian.h
diff --git a/code/crypto/include/md32_common.h b/code/core/crypto/include/md32_common.h
index 7a6e893..7a6e893 100644
--- a/code/crypto/include/md32_common.h
+++ b/code/core/crypto/include/md32_common.h
diff --git a/code/crypto/include/poly1305.h b/code/core/crypto/include/poly1305.h
index d7af3df..d7af3df 100644
--- a/code/crypto/include/poly1305.h
+++ b/code/core/crypto/include/poly1305.h
diff --git a/code/crypto/include/sha.h b/code/core/crypto/include/sha.h
index 93af5d9..93af5d9 100644
--- a/code/crypto/include/sha.h
+++ b/code/core/crypto/include/sha.h
diff --git a/code/crypto/poly1305/Makefile b/code/core/crypto/poly1305/Makefile
index 6ddec33..6ddec33 100644
--- a/code/crypto/poly1305/Makefile
+++ b/code/core/crypto/poly1305/Makefile
diff --git a/code/crypto/poly1305/poly1305-donna.c b/code/core/crypto/poly1305/poly1305-donna.c
index 773ea4e..773ea4e 100644
--- a/code/crypto/poly1305/poly1305-donna.c
+++ b/code/core/crypto/poly1305/poly1305-donna.c
diff --git a/code/crypto/poly1305/poly1305.c b/code/core/crypto/poly1305/poly1305.c
index 5f3f111..5f3f111 100644
--- a/code/crypto/poly1305/poly1305.c
+++ b/code/core/crypto/poly1305/poly1305.c
diff --git a/code/crypto/sha/Makefile b/code/core/crypto/sha/Makefile
index 8a50b28..8a50b28 100644
--- a/code/crypto/sha/Makefile
+++ b/code/core/crypto/sha/Makefile
diff --git a/code/crypto/sha/sha1-elf-x86_64.S b/code/core/crypto/sha/sha1-elf-x86_64.S
index d7ef2bf..d7ef2bf 100644
--- a/code/crypto/sha/sha1-elf-x86_64.S
+++ b/code/core/crypto/sha/sha1-elf-x86_64.S
diff --git a/code/crypto/sha/sha1-macosx-x86_64.S b/code/core/crypto/sha/sha1-macosx-x86_64.S
index f5c2c36..f5c2c36 100644
--- a/code/crypto/sha/sha1-macosx-x86_64.S
+++ b/code/core/crypto/sha/sha1-macosx-x86_64.S
diff --git a/code/crypto/sha/sha1_one.c b/code/core/crypto/sha/sha1_one.c
index 080ea4d..080ea4d 100644
--- a/code/crypto/sha/sha1_one.c
+++ b/code/core/crypto/sha/sha1_one.c
diff --git a/code/crypto/sha/sha1dgst.c b/code/core/crypto/sha/sha1dgst.c
index acc576c..acc576c 100644
--- a/code/crypto/sha/sha1dgst.c
+++ b/code/core/crypto/sha/sha1dgst.c
diff --git a/code/crypto/sha/sha256-elf-x86_64.S b/code/core/crypto/sha/sha256-elf-x86_64.S
index 599a5cb..599a5cb 100644
--- a/code/crypto/sha/sha256-elf-x86_64.S
+++ b/code/core/crypto/sha/sha256-elf-x86_64.S
diff --git a/code/crypto/sha/sha256-macosx-x86_64.S b/code/core/crypto/sha/sha256-macosx-x86_64.S
index 3ecafca..3ecafca 100644
--- a/code/crypto/sha/sha256-macosx-x86_64.S
+++ b/code/core/crypto/sha/sha256-macosx-x86_64.S
diff --git a/code/crypto/sha/sha256.c b/code/core/crypto/sha/sha256.c
index ee22321..ee22321 100644
--- a/code/crypto/sha/sha256.c
+++ b/code/core/crypto/sha/sha256.c
diff --git a/code/crypto/sha/sha512-elf-x86_64.S b/code/core/crypto/sha/sha512-elf-x86_64.S
index d218304..d218304 100644
--- a/code/crypto/sha/sha512-elf-x86_64.S
+++ b/code/core/crypto/sha/sha512-elf-x86_64.S
diff --git a/code/crypto/sha/sha512-macosx-x86_64.S b/code/core/crypto/sha/sha512-macosx-x86_64.S
index 4a51d14..4a51d14 100644
--- a/code/crypto/sha/sha512-macosx-x86_64.S
+++ b/code/core/crypto/sha/sha512-macosx-x86_64.S
diff --git a/code/crypto/sha/sha512.c b/code/core/crypto/sha/sha512.c
index 364c85c..364c85c 100644
--- a/code/crypto/sha/sha512.c
+++ b/code/core/crypto/sha/sha512.c
diff --git a/code/crypto/sha/sha_locl.h b/code/core/crypto/sha/sha_locl.h
index f6d305d..f6d305d 100644
--- a/code/crypto/sha/sha_locl.h
+++ b/code/core/crypto/sha/sha_locl.h
diff --git a/code/crypto/test/Makefile b/code/core/crypto/test/Makefile
index b6a92f2..b6a92f2 100644
--- a/code/crypto/test/Makefile
+++ b/code/core/crypto/test/Makefile
diff --git a/code/crypto/test/aead.c b/code/core/crypto/test/aead.c
index a2e0da7..a2e0da7 100644
--- a/code/crypto/test/aead.c
+++ b/code/core/crypto/test/aead.c
diff --git a/code/crypto/test/aead_dec.c b/code/core/crypto/test/aead_dec.c
index 7deb587..7deb587 100644
--- a/code/crypto/test/aead_dec.c
+++ b/code/core/crypto/test/aead_dec.c
diff --git a/code/crypto/test/aead_enc.c b/code/core/crypto/test/aead_enc.c
index a103490..a103490 100644
--- a/code/crypto/test/aead_enc.c
+++ b/code/core/crypto/test/aead_enc.c
diff --git a/code/crypto/test/ed25519.c b/code/core/crypto/test/ed25519.c
index 21334cb..21334cb 100644
--- a/code/crypto/test/ed25519.c
+++ b/code/core/crypto/test/ed25519.c
diff --git a/code/crypto/test/ed25519_open.c b/code/core/crypto/test/ed25519_open.c
index 66f32f5..66f32f5 100644
--- a/code/crypto/test/ed25519_open.c
+++ b/code/core/crypto/test/ed25519_open.c
diff --git a/code/crypto/test/ed25519_sign.c b/code/core/crypto/test/ed25519_sign.c
index da098bd..da098bd 100644
--- a/code/crypto/test/ed25519_sign.c
+++ b/code/core/crypto/test/ed25519_sign.c
diff --git a/code/htable/Makefile b/code/core/htable/Makefile
index af329b4..af329b4 100644
--- a/code/htable/Makefile
+++ b/code/core/htable/Makefile
diff --git a/code/htable/hashtable.c b/code/core/htable/hashtable.c
index 8174a5d..8174a5d 100755
--- a/code/htable/hashtable.c
+++ b/code/core/htable/hashtable.c
diff --git a/code/htable/hashtable.h b/code/core/htable/hashtable.h
index d99f1c4..d99f1c4 100755
--- a/code/htable/hashtable.h
+++ b/code/core/htable/hashtable.h
diff --git a/code/htable/hashtable_itr.c b/code/core/htable/hashtable_itr.c
index 3ee8fe2..3ee8fe2 100755
--- a/code/htable/hashtable_itr.c
+++ b/code/core/htable/hashtable_itr.c
diff --git a/code/htable/hashtable_itr.h b/code/core/htable/hashtable_itr.h
index 658ae83..658ae83 100755
--- a/code/htable/hashtable_itr.h
+++ b/code/core/htable/hashtable_itr.h
diff --git a/code/htable/hashtable_private.h b/code/core/htable/hashtable_private.h
index 2330b00..2330b00 100755
--- a/code/htable/hashtable_private.h
+++ b/code/core/htable/hashtable_private.h
diff --git a/code/htable/htable.c b/code/core/htable/htable.c
index 4a9ee11..4a9ee11 100644
--- a/code/htable/htable.c
+++ b/code/core/htable/htable.c
diff --git a/code/msgq.c b/code/core/msgq.c
index 53c55ea..53c55ea 100644
--- a/code/msgq.c
+++ b/code/core/msgq.c
diff --git a/code/msgq.h b/code/core/msgq.h
index 9d16f63..9d16f63 100644
--- a/code/msgq.h
+++ b/code/core/msgq.h
diff --git a/code/posix/Makefile b/code/core/posix/Makefile
index 64cf5f6..64cf5f6 100644
--- a/code/posix/Makefile
+++ b/code/core/posix/Makefile
diff --git a/code/posix/time.c b/code/core/posix/time.c
index 3dd3920..3dd3920 100644
--- a/code/posix/time.c
+++ b/code/core/posix/time.c
diff --git a/code/posix/transport.c b/code/core/posix/transport.c
index 1787c66..1787c66 100644
--- a/code/posix/transport.c
+++ b/code/core/posix/transport.c
diff --git a/code/posix/transport.h b/code/core/posix/transport.h
index c35e13e..c35e13e 100644
--- a/code/posix/transport.h
+++ b/code/core/posix/transport.h
diff --git a/code/timer.c b/code/core/timer.c
index cf77d6e..cf77d6e 100644
--- a/code/timer.c
+++ b/code/core/timer.c
diff --git a/code/timer.h b/code/core/timer.h
index 0d43a99..0d43a99 100644
--- a/code/timer.h
+++ b/code/core/timer.h
diff --git a/code/proxy.c b/code/proxy/proxy.c
index ae66318..ae66318 100644
--- a/code/proxy.c
+++ b/code/proxy/proxy.c
diff --git a/code/proxy.h b/code/proxy/proxy.h
index c6d5422..c6d5422 100644
--- a/code/proxy.h
+++ b/code/proxy/proxy.h
diff --git a/code/test/Makefile b/code/test/Makefile
index 02ade87..5c25b5e 100644
--- a/code/test/Makefile
+++ b/code/test/Makefile
@@ -1,6 +1,6 @@
-CFLAGS=-I.. -O3 -Wno-int-to-void-pointer-cast
+CFLAGS=-I../core -O3 -Wno-int-to-void-pointer-cast
 LDFLAGS=-lm -pthread
-dep=../libecpcore.a ../crypto/libecpcr.a ../htable/libecpht.a ../posix/libecptr.a ../posix/libecptm.a ../init.o
+dep=../core/libecpcore.a ../core/crypto/libecpcr.a ../core/htable/libecpht.a ../core/posix/libecptr.a ../core/posix/libecptm.a init.o
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c $<
diff --git a/code/init.c b/code/test/init.c
index 7e39f87..7e39f87 100644
--- a/code/init.c
+++ b/code/test/init.c
diff --git a/code/init_proxy.c b/code/test/init_proxy.c
index c7f560d..c7f560d 100644
--- a/code/init_proxy.c
+++ b/code/test/init_proxy.c