ecp moved to root; fixed utils and tests

118 files changed, 16 insertions, 16 deletions

diff --git a/code/build.sh b/ecp/build.sh
index f08ad7e..0b205dd 100755
--- a/code/build.sh
+++ b/ecp/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-subdirs="ecp util test"
+subdirs="src util test"
 
 for i in $subdirs; do
 	(cd $i && make $1 && cd ..) || exit;
diff --git a/code/ecp/LICENSE b/ecp/src/LICENSE
index d159169..d159169 100644
--- a/code/ecp/LICENSE
+++ b/ecp/src/LICENSE
diff --git a/code/ecp/Makefile b/ecp/src/Makefile
index 9456a4b..9456a4b 100644
--- a/code/ecp/Makefile
+++ b/ecp/src/Makefile
diff --git a/code/ecp/Makefile.fe310 b/ecp/src/Makefile.fe310
index 5b670c1..5b670c1 100644
--- a/code/ecp/Makefile.fe310
+++ b/ecp/src/Makefile.fe310
diff --git a/code/ecp/Makefile.posix b/ecp/src/Makefile.posix
index aed4d67..aed4d67 100644
--- a/code/ecp/Makefile.posix
+++ b/ecp/src/Makefile.posix
diff --git a/code/ecp/TODO b/ecp/src/TODO
index 982e382..982e382 100644
--- a/code/ecp/TODO
+++ b/ecp/src/TODO
diff --git a/code/ecp/core.c b/ecp/src/core.c
index ae5eca1..ae5eca1 100644
--- a/code/ecp/core.c
+++ b/ecp/src/core.c
diff --git a/code/ecp/core.h b/ecp/src/core.h
index 7ab116e..7ab116e 100644
--- a/code/ecp/core.h
+++ b/ecp/src/core.h
diff --git a/code/ecp/cr.h b/ecp/src/cr.h
index a8d0dea..a8d0dea 100644
--- a/code/ecp/cr.h
+++ b/ecp/src/cr.h
diff --git a/code/ecp/crypto/Makefile b/ecp/src/crypto/Makefile
index cbbc60f..cbbc60f 100644
--- a/code/ecp/crypto/Makefile
+++ b/ecp/src/crypto/Makefile
diff --git a/code/ecp/crypto/arc4random/Makefile b/ecp/src/crypto/arc4random/Makefile
index 387bca1..387bca1 100755
--- a/code/ecp/crypto/arc4random/Makefile
+++ b/ecp/src/crypto/arc4random/Makefile
diff --git a/code/ecp/crypto/arc4random/arc4random.c b/ecp/src/crypto/arc4random/arc4random.c
index 23ce9b7..23ce9b7 100755
--- a/code/ecp/crypto/arc4random/arc4random.c
+++ b/ecp/src/crypto/arc4random/arc4random.c
diff --git a/code/ecp/crypto/arc4random/arc4random.h b/ecp/src/crypto/arc4random/arc4random.h
index e281a89..e281a89 100755
--- a/code/ecp/crypto/arc4random/arc4random.h
+++ b/ecp/src/crypto/arc4random/arc4random.h
diff --git a/code/ecp/crypto/arc4random/chacha_private.h b/ecp/src/crypto/arc4random/chacha_private.h
index 05ce200..05ce200 100755
--- a/code/ecp/crypto/arc4random/chacha_private.h
+++ b/ecp/src/crypto/arc4random/chacha_private.h
diff --git a/code/ecp/crypto/chacha/Makefile b/ecp/src/crypto/chacha/Makefile
index bd747e5..bd747e5 100644
--- a/code/ecp/crypto/chacha/Makefile
+++ b/ecp/src/crypto/chacha/Makefile
diff --git a/code/ecp/crypto/chacha/chacha-merged.c b/ecp/src/crypto/chacha/chacha-merged.c
index 557dfd5..557dfd5 100644
--- a/code/ecp/crypto/chacha/chacha-merged.c
+++ b/ecp/src/crypto/chacha/chacha-merged.c
diff --git a/code/ecp/crypto/chacha/chacha.c b/ecp/src/crypto/chacha/chacha.c
index fba03c9..fba03c9 100644
--- a/code/ecp/crypto/chacha/chacha.c
+++ b/ecp/src/crypto/chacha/chacha.c
diff --git a/code/ecp/crypto/compat/Makefile b/ecp/src/crypto/compat/Makefile
index 1a8c2ee..1a8c2ee 100644
--- a/code/ecp/crypto/compat/Makefile
+++ b/ecp/src/crypto/compat/Makefile
diff --git a/code/ecp/crypto/compat/explicit_bzero.c b/ecp/src/crypto/compat/explicit_bzero.c
index 5dd0103..5dd0103 100644
--- a/code/ecp/crypto/compat/explicit_bzero.c
+++ b/ecp/src/crypto/compat/explicit_bzero.c
diff --git a/code/ecp/crypto/compat/timingsafe_bcmp.c b/ecp/src/crypto/compat/timingsafe_bcmp.c
index 552e844..552e844 100644
--- a/code/ecp/crypto/compat/timingsafe_bcmp.c
+++ b/ecp/src/crypto/compat/timingsafe_bcmp.c
diff --git a/code/ecp/crypto/compat/timingsafe_memcmp.c b/ecp/src/crypto/compat/timingsafe_memcmp.c
index bb210a3..bb210a3 100644
--- a/code/ecp/crypto/compat/timingsafe_memcmp.c
+++ b/ecp/src/crypto/compat/timingsafe_memcmp.c
diff --git a/code/ecp/crypto/crypto.c b/ecp/src/crypto/crypto.c
index ae0b3d3..ae0b3d3 100644
--- a/code/ecp/crypto/crypto.c
+++ b/ecp/src/crypto/crypto.c
diff --git a/code/ecp/crypto/crypto.h b/ecp/src/crypto/crypto.h
index 86b072c..86b072c 100644
--- a/code/ecp/crypto/crypto.h
+++ b/ecp/src/crypto/crypto.h
diff --git a/code/ecp/crypto/curve25519/Makefile b/ecp/src/crypto/curve25519/Makefile
index 85839bb..85839bb 100644
--- a/code/ecp/crypto/curve25519/Makefile
+++ b/ecp/src/crypto/curve25519/Makefile
diff --git a/code/ecp/crypto/curve25519/curve25519-generic.c b/ecp/src/crypto/curve25519/curve25519-generic.c
index e7373d2..e7373d2 100644
--- a/code/ecp/crypto/curve25519/curve25519-generic.c
+++ b/ecp/src/crypto/curve25519/curve25519-generic.c
diff --git a/code/ecp/crypto/curve25519/curve25519.c b/ecp/src/crypto/curve25519/curve25519.c
index f5f57e6..f5f57e6 100644
--- a/code/ecp/crypto/curve25519/curve25519.c
+++ b/ecp/src/crypto/curve25519/curve25519.c
diff --git a/code/ecp/crypto/curve25519/curve25519_internal.h b/ecp/src/crypto/curve25519/curve25519_internal.h
index f80424a..f80424a 100644
--- a/code/ecp/crypto/curve25519/curve25519_internal.h
+++ b/ecp/src/crypto/curve25519/curve25519_internal.h
diff --git a/code/ecp/crypto/e_chacha20poly1305.c b/ecp/src/crypto/e_chacha20poly1305.c
index 17fcab8..17fcab8 100644
--- a/code/ecp/crypto/e_chacha20poly1305.c
+++ b/ecp/src/crypto/e_chacha20poly1305.c
diff --git a/code/ecp/crypto/include/chacha.h b/ecp/src/crypto/include/chacha.h
index 25a3ef3..25a3ef3 100644
--- a/code/ecp/crypto/include/chacha.h
+++ b/ecp/src/crypto/include/chacha.h
diff --git a/code/ecp/crypto/include/compat.h b/ecp/src/crypto/include/compat.h
index 12fb3f4..12fb3f4 100644
--- a/code/ecp/crypto/include/compat.h
+++ b/ecp/src/crypto/include/compat.h
diff --git a/code/ecp/crypto/include/curve25519.h b/ecp/src/crypto/include/curve25519.h
index a7092cb..a7092cb 100644
--- a/code/ecp/crypto/include/curve25519.h
+++ b/ecp/src/crypto/include/curve25519.h
diff --git a/code/ecp/crypto/include/machine/endian.h b/ecp/src/crypto/include/machine/endian.h
index 5ec39af..5ec39af 100644
--- a/code/ecp/crypto/include/machine/endian.h
+++ b/ecp/src/crypto/include/machine/endian.h
diff --git a/code/ecp/crypto/include/md32_common.h b/ecp/src/crypto/include/md32_common.h
index 7a6e893..7a6e893 100644
--- a/code/ecp/crypto/include/md32_common.h
+++ b/ecp/src/crypto/include/md32_common.h
diff --git a/code/ecp/crypto/include/poly1305.h b/ecp/src/crypto/include/poly1305.h
index d7af3df..d7af3df 100644
--- a/code/ecp/crypto/include/poly1305.h
+++ b/ecp/src/crypto/include/poly1305.h
diff --git a/code/ecp/crypto/include/sha.h b/ecp/src/crypto/include/sha.h
index 93af5d9..93af5d9 100644
--- a/code/ecp/crypto/include/sha.h
+++ b/ecp/src/crypto/include/sha.h
diff --git a/code/ecp/crypto/poly1305/Makefile b/ecp/src/crypto/poly1305/Makefile
index 7645ca4..7645ca4 100644
--- a/code/ecp/crypto/poly1305/Makefile
+++ b/ecp/src/crypto/poly1305/Makefile
diff --git a/code/ecp/crypto/poly1305/poly1305-donna.c b/ecp/src/crypto/poly1305/poly1305-donna.c
index 773ea4e..773ea4e 100644
--- a/code/ecp/crypto/poly1305/poly1305-donna.c
+++ b/ecp/src/crypto/poly1305/poly1305-donna.c
diff --git a/code/ecp/crypto/poly1305/poly1305.c b/ecp/src/crypto/poly1305/poly1305.c
index 5f3f111..5f3f111 100644
--- a/code/ecp/crypto/poly1305/poly1305.c
+++ b/ecp/src/crypto/poly1305/poly1305.c
diff --git a/code/ecp/crypto/sha/Makefile b/ecp/src/crypto/sha/Makefile
index 1fc67da..1fc67da 100644
--- a/code/ecp/crypto/sha/Makefile
+++ b/ecp/src/crypto/sha/Makefile
diff --git a/code/ecp/crypto/sha/sha1-elf-x86_64.S b/ecp/src/crypto/sha/sha1-elf-x86_64.S
index d7ef2bf..d7ef2bf 100644
--- a/code/ecp/crypto/sha/sha1-elf-x86_64.S
+++ b/ecp/src/crypto/sha/sha1-elf-x86_64.S
diff --git a/code/ecp/crypto/sha/sha1-macosx-x86_64.S b/ecp/src/crypto/sha/sha1-macosx-x86_64.S
index f5c2c36..f5c2c36 100644
--- a/code/ecp/crypto/sha/sha1-macosx-x86_64.S
+++ b/ecp/src/crypto/sha/sha1-macosx-x86_64.S
diff --git a/code/ecp/crypto/sha/sha1_one.c b/ecp/src/crypto/sha/sha1_one.c
index 080ea4d..080ea4d 100644
--- a/code/ecp/crypto/sha/sha1_one.c
+++ b/ecp/src/crypto/sha/sha1_one.c
diff --git a/code/ecp/crypto/sha/sha1dgst.c b/ecp/src/crypto/sha/sha1dgst.c
index acc576c..acc576c 100644
--- a/code/ecp/crypto/sha/sha1dgst.c
+++ b/ecp/src/crypto/sha/sha1dgst.c
diff --git a/code/ecp/crypto/sha/sha256-elf-x86_64.S b/ecp/src/crypto/sha/sha256-elf-x86_64.S
index 599a5cb..599a5cb 100644
--- a/code/ecp/crypto/sha/sha256-elf-x86_64.S
+++ b/ecp/src/crypto/sha/sha256-elf-x86_64.S
diff --git a/code/ecp/crypto/sha/sha256-macosx-x86_64.S b/ecp/src/crypto/sha/sha256-macosx-x86_64.S
index 3ecafca..3ecafca 100644
--- a/code/ecp/crypto/sha/sha256-macosx-x86_64.S
+++ b/ecp/src/crypto/sha/sha256-macosx-x86_64.S
diff --git a/code/ecp/crypto/sha/sha256.c b/ecp/src/crypto/sha/sha256.c
index ee22321..ee22321 100644
--- a/code/ecp/crypto/sha/sha256.c
+++ b/ecp/src/crypto/sha/sha256.c
diff --git a/code/ecp/crypto/sha/sha512-elf-x86_64.S b/ecp/src/crypto/sha/sha512-elf-x86_64.S
index d218304..d218304 100644
--- a/code/ecp/crypto/sha/sha512-elf-x86_64.S
+++ b/ecp/src/crypto/sha/sha512-elf-x86_64.S
diff --git a/code/ecp/crypto/sha/sha512-macosx-x86_64.S b/ecp/src/crypto/sha/sha512-macosx-x86_64.S
index 4a51d14..4a51d14 100644
--- a/code/ecp/crypto/sha/sha512-macosx-x86_64.S
+++ b/ecp/src/crypto/sha/sha512-macosx-x86_64.S
diff --git a/code/ecp/crypto/sha/sha512.c b/ecp/src/crypto/sha/sha512.c
index 364c85c..364c85c 100644
--- a/code/ecp/crypto/sha/sha512.c
+++ b/ecp/src/crypto/sha/sha512.c
diff --git a/code/ecp/crypto/sha/sha_locl.h b/ecp/src/crypto/sha/sha_locl.h
index f6d305d..f6d305d 100644
--- a/code/ecp/crypto/sha/sha_locl.h
+++ b/ecp/src/crypto/sha/sha_locl.h
diff --git a/code/ecp/crypto/test/Makefile b/ecp/src/crypto/test/Makefile
index 0b5013f..0b5013f 100644
--- a/code/ecp/crypto/test/Makefile
+++ b/ecp/src/crypto/test/Makefile
diff --git a/code/ecp/crypto/test/aead.c b/ecp/src/crypto/test/aead.c
index a2e0da7..a2e0da7 100644
--- a/code/ecp/crypto/test/aead.c
+++ b/ecp/src/crypto/test/aead.c
diff --git a/code/ecp/crypto/test/aead_dec.c b/ecp/src/crypto/test/aead_dec.c
index 7deb587..7deb587 100644
--- a/code/ecp/crypto/test/aead_dec.c
+++ b/ecp/src/crypto/test/aead_dec.c
diff --git a/code/ecp/crypto/test/aead_enc.c b/ecp/src/crypto/test/aead_enc.c
index a103490..a103490 100644
--- a/code/ecp/crypto/test/aead_enc.c
+++ b/ecp/src/crypto/test/aead_enc.c
diff --git a/code/ecp/crypto/test/ed25519.c b/ecp/src/crypto/test/ed25519.c
index 21334cb..21334cb 100644
--- a/code/ecp/crypto/test/ed25519.c
+++ b/ecp/src/crypto/test/ed25519.c
diff --git a/code/ecp/crypto/test/ed25519_open.c b/ecp/src/crypto/test/ed25519_open.c
index 66f32f5..66f32f5 100644
--- a/code/ecp/crypto/test/ed25519_open.c
+++ b/ecp/src/crypto/test/ed25519_open.c
diff --git a/code/ecp/crypto/test/ed25519_sign.c b/ecp/src/crypto/test/ed25519_sign.c
index da098bd..da098bd 100644
--- a/code/ecp/crypto/test/ed25519_sign.c
+++ b/ecp/src/crypto/test/ed25519_sign.c
diff --git a/code/ecp/fe310/Makefile b/ecp/src/fe310/Makefile
index c781824..c781824 100644
--- a/code/ecp/fe310/Makefile
+++ b/ecp/src/fe310/Makefile
diff --git a/code/ecp/fe310/time.c b/ecp/src/fe310/time.c
index 3c74933..3c74933 100644
--- a/code/ecp/fe310/time.c
+++ b/ecp/src/fe310/time.c
diff --git a/code/ecp/fe310/transport.c b/ecp/src/fe310/transport.c
index 4f50049..4f50049 100644
--- a/code/ecp/fe310/transport.c
+++ b/ecp/src/fe310/transport.c
diff --git a/code/ecp/fe310/transport.h b/ecp/src/fe310/transport.h
index 0fcf43b..0fcf43b 100644
--- a/code/ecp/fe310/transport.h
+++ b/ecp/src/fe310/transport.h
diff --git a/code/ecp/ht.h b/ecp/src/ht.h
index 13bf1d7..13bf1d7 100644
--- a/code/ecp/ht.h
+++ b/ecp/src/ht.h
diff --git a/code/ecp/htable/Makefile b/ecp/src/htable/Makefile
index 7ef95d5..7ef95d5 100644
--- a/code/ecp/htable/Makefile
+++ b/ecp/src/htable/Makefile
diff --git a/code/ecp/htable/hashtable.c b/ecp/src/htable/hashtable.c
index de15827..de15827 100755
--- a/code/ecp/htable/hashtable.c
+++ b/ecp/src/htable/hashtable.c
diff --git a/code/ecp/htable/hashtable.h b/ecp/src/htable/hashtable.h
index 046f740..046f740 100755
--- a/code/ecp/htable/hashtable.h
+++ b/ecp/src/htable/hashtable.h
diff --git a/code/ecp/htable/hashtable_itr.c b/ecp/src/htable/hashtable_itr.c
index 3ee8fe2..3ee8fe2 100755
--- a/code/ecp/htable/hashtable_itr.c
+++ b/ecp/src/htable/hashtable_itr.c
diff --git a/code/ecp/htable/hashtable_itr.h b/ecp/src/htable/hashtable_itr.h
index 658ae83..658ae83 100755
--- a/code/ecp/htable/hashtable_itr.h
+++ b/ecp/src/htable/hashtable_itr.h
diff --git a/code/ecp/htable/hashtable_private.h b/ecp/src/htable/hashtable_private.h
index 2330b00..2330b00 100755
--- a/code/ecp/htable/hashtable_private.h
+++ b/ecp/src/htable/hashtable_private.h
diff --git a/code/ecp/htable/htable.c b/ecp/src/htable/htable.c
index a46291b..a46291b 100644
--- a/code/ecp/htable/htable.c
+++ b/ecp/src/htable/htable.c
diff --git a/code/ecp/msgq.c b/ecp/src/msgq.c
index 201af4a..201af4a 100644
--- a/code/ecp/msgq.c
+++ b/ecp/src/msgq.c
diff --git a/code/ecp/msgq.h b/ecp/src/msgq.h
index a81ff36..a81ff36 100644
--- a/code/ecp/msgq.h
+++ b/ecp/src/msgq.h
diff --git a/code/ecp/platform.sh b/ecp/src/platform.sh
index 854fbba..854fbba 100755
--- a/code/ecp/platform.sh
+++ b/ecp/src/platform.sh
diff --git a/code/ecp/posix/Makefile b/ecp/src/posix/Makefile
index c781824..c781824 100644
--- a/code/ecp/posix/Makefile
+++ b/ecp/src/posix/Makefile
diff --git a/code/ecp/posix/time.c b/ecp/src/posix/time.c
index 111e598..111e598 100644
--- a/code/ecp/posix/time.c
+++ b/ecp/src/posix/time.c
diff --git a/code/ecp/posix/transport.c b/ecp/src/posix/transport.c
index 2032ce2..2032ce2 100644
--- a/code/ecp/posix/transport.c
+++ b/ecp/src/posix/transport.c
diff --git a/code/ecp/posix/transport.h b/ecp/src/posix/transport.h
index 6d6d219..6d6d219 100644
--- a/code/ecp/posix/transport.h
+++ b/ecp/src/posix/transport.h
diff --git a/code/ecp/rbuf.c b/ecp/src/rbuf.c
index 534381c..534381c 100644
--- a/code/ecp/rbuf.c
+++ b/ecp/src/rbuf.c
diff --git a/code/ecp/rbuf.h b/ecp/src/rbuf.h
index 289a0c4..289a0c4 100644
--- a/code/ecp/rbuf.h
+++ b/ecp/src/rbuf.h
diff --git a/code/ecp/rbuf_recv.c b/ecp/src/rbuf_recv.c
index b9b16a2..b9b16a2 100644
--- a/code/ecp/rbuf_recv.c
+++ b/ecp/src/rbuf_recv.c
diff --git a/code/ecp/rbuf_send.c b/ecp/src/rbuf_send.c
index 5847744..5847744 100644
--- a/code/ecp/rbuf_send.c
+++ b/ecp/src/rbuf_send.c
diff --git a/code/ecp/timer.c b/ecp/src/timer.c
index 5460437..5460437 100644
--- a/code/ecp/timer.c
+++ b/ecp/src/timer.c
diff --git a/code/ecp/timer.h b/ecp/src/timer.h
index 5bccff1..5bccff1 100644
--- a/code/ecp/timer.h
+++ b/ecp/src/timer.h
diff --git a/code/ecp/tm.h b/ecp/src/tm.h
index 00c6fad..00c6fad 100644
--- a/code/ecp/tm.h
+++ b/ecp/src/tm.h
diff --git a/code/ecp/tr.h b/ecp/src/tr.h
index 116590b..116590b 100644
--- a/code/ecp/tr.h
+++ b/ecp/src/tr.h
diff --git a/code/ecp/vconn/Makefile b/ecp/src/vconn/Makefile
index 9d11406..9d11406 100644
--- a/code/ecp/vconn/Makefile
+++ b/ecp/src/vconn/Makefile
diff --git a/code/ecp/vconn/vconn.c b/ecp/src/vconn/vconn.c
index 348b2f2..348b2f2 100644
--- a/code/ecp/vconn/vconn.c
+++ b/ecp/src/vconn/vconn.c
diff --git a/code/ecp/vconn/vconn.h b/ecp/src/vconn/vconn.h
index dbf51f1..dbf51f1 100644
--- a/code/ecp/vconn/vconn.h
+++ b/ecp/src/vconn/vconn.h
diff --git a/code/test/Makefile b/ecp/test/Makefile
index 9c804a3..863a3ef 100644
--- a/code/test/Makefile
+++ b/ecp/test/Makefile
@@ -1,8 +1,7 @@
-include ../ecp/Makefile.posix
-CFLAGS=$(CFLAGS_PL) -I../ecp -I../util -Wno-int-to-void-pointer-cast
-LDFLAGS=$(LDFLAGS_PL)
+include ../src/Makefile.posix
+CFLAGS += -I../src -I../util -Wno-int-to-void-pointer-cast
 
-dep=../ecp/build-posix/*.a ../util/libecputil.a
+dep=../src/build-posix/*.a ../util/libecputil.a
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c $<
@@ -45,7 +44,7 @@ voip.o: voip.c
 	$(CC) $(CFLAGS) -I $(opus_root)/include -c $<
 
 voip: voip.o init.o $(dep)
-	$(CC) -o $@ $< init.o $(dep) $(opus_root)/.libs/libopus.a -lm $(LDFLAGS) -l asound 
+	$(CC) -o $@ $< init.o $(dep) $(opus_root)/.libs/libopus.a -lm $(LDFLAGS) -l asound
 
 clean:
 	rm -f *.o
diff --git a/code/test/basic.c b/ecp/test/basic.c
index 8268599..8268599 100644
--- a/code/test/basic.c
+++ b/ecp/test/basic.c
diff --git a/code/test/client.c b/ecp/test/client.c
index e6c8208..e6c8208 100644
--- a/code/test/client.c
+++ b/ecp/test/client.c
diff --git a/code/test/echo.c b/ecp/test/echo.c
index ff9c01c..ff9c01c 100644
--- a/code/test/echo.c
+++ b/ecp/test/echo.c
diff --git a/code/test/frag.c b/ecp/test/frag.c
index 2bba856..2bba856 100644
--- a/code/test/frag.c
+++ b/ecp/test/frag.c
diff --git a/code/test/init.c b/ecp/test/init.c
index 7e39f87..7e39f87 100644
--- a/code/test/init.c
+++ b/ecp/test/init.c
diff --git a/code/test/init_vconn.c b/ecp/test/init_vconn.c
index 7e3dd04..7e3dd04 100644
--- a/code/test/init_vconn.c
+++ b/ecp/test/init_vconn.c
diff --git a/code/test/server.c b/ecp/test/server.c
index f70cc79..f70cc79 100644
--- a/code/test/server.c
+++ b/ecp/test/server.c
diff --git a/code/test/stress.c b/ecp/test/stress.c
index 73c511e..73c511e 100644
--- a/code/test/stress.c
+++ b/ecp/test/stress.c
diff --git a/code/test/vc_client.c b/ecp/test/vc_client.c
index e654e76..e654e76 100644
--- a/code/test/vc_client.c
+++ b/ecp/test/vc_client.c
diff --git a/code/test/vc_client_t.c b/ecp/test/vc_client_t.c
index b021c2d..b021c2d 100644
--- a/code/test/vc_client_t.c
+++ b/ecp/test/vc_client_t.c
diff --git a/code/test/vc_server.c b/ecp/test/vc_server.c
index 55f15d1..55f15d1 100644
--- a/code/test/vc_server.c
+++ b/ecp/test/vc_server.c
diff --git a/code/test/vcs.c b/ecp/test/vcs.c
index 23e2557..23e2557 100644
--- a/code/test/vcs.c
+++ b/ecp/test/vcs.c
diff --git a/code/test/vid/Makefile b/ecp/test/vid/Makefile
index 03fdaba..a9b92eb 100644
--- a/code/test/vid/Makefile
+++ b/ecp/test/vid/Makefile
@@ -1,8 +1,9 @@
 include ../../ecp/Makefile.platform
 
-LIBVPX_HOME=/opt/my/libvpx
-CFLAGS=$(CFLAGS_PL) -D_V4L2_KERNEL_ -I/usr/src/linux-headers-$(uname -r) -I$(LIBVPX_HOME) -I/opt/local/include/SDL2 -I../../ecp -I../../util -Wno-int-to-void-pointer-cast
-LDFLAGS=$(LDFLAGS_PL) -L$(LIBVPX_HOME) -L/opt/local/lib 
+LIBVPX_HOME = /opt/my/libvpx
+CFLAGS += -D_V4L2_KERNEL_ -I/usr/src/linux-headers-$(uname -r) -I$(LIBVPX_HOME) -I/opt/local/include/SDL2 -I../../ecp -I../../util -Wno-int-to-void-pointer-cast
+LDFLAGS += -L$(LIBVPX_HOME) -L/opt/local/lib
+
 dep=../init_vconn.o ../../ecp/build-posix/*.a ../../util/libecputil.a
 
 all: cap
@@ -10,9 +11,9 @@ all: cap
 %.o: %.c
 	$(CC) $(CFLAGS) -c $<
 
-cap: cap.o enc.o tools.o server.o 
+cap: cap.o enc.o tools.o server.o
 	$(CC) -o $@ $< enc.o tools.o server.o $(dep) -lvpx $(LDFLAGS)
-	
+
 client: client.o display.o tools.o
 	$(CC) -o $@ $< display.o tools.o $(dep) -lvpx -lSDL2 $(LDFLAGS)
 
diff --git a/code/test/vid/cap.c b/ecp/test/vid/cap.c
index e37c28f..e37c28f 100644
--- a/code/test/vid/cap.c
+++ b/ecp/test/vid/cap.c
diff --git a/code/test/vid/cap.sh b/ecp/test/vid/cap.sh
index bfd933e..bfd933e 100755
--- a/code/test/vid/cap.sh
+++ b/ecp/test/vid/cap.sh
diff --git a/code/test/vid/client.c b/ecp/test/vid/client.c
index 017967b..017967b 100644
--- a/code/test/vid/client.c
+++ b/ecp/test/vid/client.c
diff --git a/code/test/vid/display.c b/ecp/test/vid/display.c
index d378431..d378431 100644
--- a/code/test/vid/display.c
+++ b/ecp/test/vid/display.c
diff --git a/code/test/vid/display.h b/ecp/test/vid/display.h
index 38e07be..38e07be 100644
--- a/code/test/vid/display.h
+++ b/ecp/test/vid/display.h
diff --git a/code/test/vid/enc.c b/ecp/test/vid/enc.c
index 34d0be8..34d0be8 100644
--- a/code/test/vid/enc.c
+++ b/ecp/test/vid/enc.c
diff --git a/code/test/vid/enc.h b/ecp/test/vid/enc.h
index 5acd8ce..5acd8ce 100644
--- a/code/test/vid/enc.h
+++ b/ecp/test/vid/enc.h
diff --git a/code/test/vid/server.c b/ecp/test/vid/server.c
index 9d43b7a..9d43b7a 100644
--- a/code/test/vid/server.c
+++ b/ecp/test/vid/server.c
diff --git a/code/test/vid/server.h b/ecp/test/vid/server.h
index 2158b38..2158b38 100644
--- a/code/test/vid/server.h
+++ b/ecp/test/vid/server.h
diff --git a/code/test/vid/tools.c b/ecp/test/vid/tools.c
index 0307ef6..0307ef6 100644
--- a/code/test/vid/tools.c
+++ b/ecp/test/vid/tools.c
diff --git a/code/test/vid/tools.h b/ecp/test/vid/tools.h
index 645d5ba..645d5ba 100644
--- a/code/test/vid/tools.h
+++ b/ecp/test/vid/tools.h
diff --git a/code/test/voip.c b/ecp/test/voip.c
index ad5032b..ad5032b 100644
--- a/code/test/voip.c
+++ b/ecp/test/voip.c
diff --git a/code/util/Makefile b/ecp/util/Makefile
index acbae33..b3cbc7c 100644
--- a/code/util/Makefile
+++ b/ecp/util/Makefile
@@ -1,16 +1,16 @@
-include ../ecp/Makefile.posix
-CFLAGS=$(CFLAGS_PL) -I../ecp
+include ../src/Makefile.posix
+CFLAGS=$(CFLAGS_PL) -I../src
 LDFLAGS=$(LDFLAGS_PL)
 
 obj=util.o
-dep=../ecp/build-posix/*.a ./libecputil.a 
+dep=../src/build-posix/*.a ./libecputil.a
 
 
 %.o: %.c %.h
 	$(CC) $(CFLAGS) -c $<
 
 all: libecputil.a mknode
-	
+
 libecputil.a: $(obj)
 	$(AR) rcs libecputil.a $(obj)
 
diff --git a/code/util/keydump b/ecp/util/keydump
index 9a884dc..9a884dc 100755
--- a/code/util/keydump
+++ b/ecp/util/keydump
diff --git a/code/util/mknode.c b/ecp/util/mknode.c
index 1c0a83a..a601a45 100644
--- a/code/util/mknode.c
+++ b/ecp/util/mknode.c
@@ -48,7 +48,7 @@ int main(int argc, char *argv[]) {
     rv = ecp_dhkey_generate(&ctx, &key);
     if (rv) goto err;
 
-    rv = ecp_node_init(&ctx, &node, &key.public, (argc == 3) ? argv[2] : NULL);
+    rv = ecp_node_init(&node, &key.public, (argc == 3) ? argv[2] : NULL);
     if (rv) goto err;
 
     rv = ecp_util_key_save(&ctx, &key, fn_key);
diff --git a/code/util/util.c b/ecp/util/util.c
index 4f4adc2..4f4adc2 100644
--- a/code/util/util.c
+++ b/ecp/util/util.c
diff --git a/code/util/util.h b/ecp/util/util.h
index 3d07588..3d07588 100644
--- a/code/util/util.h
+++ b/ecp/util/util.h