diff --git a/Makefile b/Makefile
deleted file mode 100644
index 5e227c3..0000000
--- a/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-CC=gcc
-CFLAGS=-Wall -pedantic -g -DUNIX_HOST
-LIBS=-lm -lreadline
-
-TARGET	= picoc
-SRCS	= picoc.c table.c lex.c parse.c expression.c heap.c type.c \
-	variable.c clibrary.c platform.c include.c \
-	platform/platform_unix.c platform/library_unix.c \
-	cstdlib/stdio.c cstdlib/math.c cstdlib/string.c cstdlib/stdlib.c \
-	cstdlib/time.c cstdlib/errno.c cstdlib/ctype.c cstdlib/stdbool.c \
-	cstdlib/unistd.c
-OBJS	:= $(SRCS:%.c=%.o)
-
-all: $(TARGET)
-
-$(TARGET): $(OBJS)
-	$(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
-
-test:	all
-	(cd tests; make test)
-
-clean:
-	rm -f $(TARGET) $(OBJS) *~
-
-count:
-	@echo "Core:"
-	@cat picoc.h interpreter.h picoc.c table.c lex.c parse.c expression.c platform.c heap.c type.c variable.c include.c | grep -v '^[ 	]*/\*' | grep -v '^[ 	]*$$' | wc
-	@echo ""
-	@echo "Everything:"
-	@cat $(SRCS) *.h */*.h | wc
-
-.PHONY: clibrary.c
-
-picoc.o: picoc.c picoc.h
-table.o: table.c interpreter.h platform.h
-lex.o: lex.c interpreter.h platform.h
-parse.o: parse.c picoc.h interpreter.h platform.h
-expression.o: expression.c interpreter.h platform.h
-heap.o: heap.c interpreter.h platform.h
-type.o: type.c interpreter.h platform.h
-variable.o: variable.c interpreter.h platform.h
-clibrary.o: clibrary.c picoc.h interpreter.h platform.h
-platform.o: platform.c picoc.h interpreter.h platform.h
-include.o: include.c picoc.h interpreter.h platform.h
-platform/platform_unix.o: platform/platform_unix.c picoc.h interpreter.h platform.h
-platform/library_unix.o: platform/library_unix.c interpreter.h platform.h
-cstdlib/stdio.o: cstdlib/stdio.c interpreter.h platform.h
-cstdlib/math.o: cstdlib/math.c interpreter.h platform.h
-cstdlib/string.o: cstdlib/string.c interpreter.h platform.h
-cstdlib/stdlib.o: cstdlib/stdlib.c interpreter.h platform.h
-cstdlib/time.o: cstdlib/time.c interpreter.h platform.h
-cstdlib/errno.o: cstdlib/errno.c interpreter.h platform.h
-cstdlib/ctype.o: cstdlib/ctype.c interpreter.h platform.h
-cstdlib/stdbool.o: cstdlib/stdbool.c interpreter.h platform.h
-cstdlib/unistd.o: cstdlib/unistd.c interpreter.h platform.h
diff --git a/clibrary.c b/ecilib/clibrary.c
similarity index 100%
rename from clibrary.c
rename to ecilib/clibrary.c
diff --git a/cstdlib/ctype.c b/ecilib/cstdlib/ctype.c
similarity index 100%
rename from cstdlib/ctype.c
rename to ecilib/cstdlib/ctype.c
diff --git a/cstdlib/errno.c b/ecilib/cstdlib/errno.c
similarity index 100%
rename from cstdlib/errno.c
rename to ecilib/cstdlib/errno.c
diff --git a/cstdlib/math.c b/ecilib/cstdlib/math.c
similarity index 100%
rename from cstdlib/math.c
rename to ecilib/cstdlib/math.c
diff --git a/cstdlib/stdbool.c b/ecilib/cstdlib/stdbool.c
similarity index 100%
rename from cstdlib/stdbool.c
rename to ecilib/cstdlib/stdbool.c
diff --git a/cstdlib/stdio.c b/ecilib/cstdlib/stdio.c
similarity index 100%
rename from cstdlib/stdio.c
rename to ecilib/cstdlib/stdio.c
diff --git a/cstdlib/stdlib.c b/ecilib/cstdlib/stdlib.c
similarity index 100%
rename from cstdlib/stdlib.c
rename to ecilib/cstdlib/stdlib.c
diff --git a/cstdlib/string.c b/ecilib/cstdlib/string.c
similarity index 100%
rename from cstdlib/string.c
rename to ecilib/cstdlib/string.c
diff --git a/cstdlib/time.c b/ecilib/cstdlib/time.c
similarity index 100%
rename from cstdlib/time.c
rename to ecilib/cstdlib/time.c
diff --git a/cstdlib/unistd.c b/ecilib/cstdlib/unistd.c
similarity index 100%
rename from cstdlib/unistd.c
rename to ecilib/cstdlib/unistd.c
diff --git a/expression.c b/ecilib/expression.c
similarity index 100%
rename from expression.c
rename to ecilib/expression.c
diff --git a/heap.c b/ecilib/heap.c
similarity index 100%
rename from heap.c
rename to ecilib/heap.c
diff --git a/include.c b/ecilib/include.c
similarity index 100%
rename from include.c
rename to ecilib/include.c
diff --git a/interpreter.h b/ecilib/interpreter.h
similarity index 100%
rename from interpreter.h
rename to ecilib/interpreter.h
diff --git a/lex.c b/ecilib/lex.c
similarity index 100%
rename from lex.c
rename to ecilib/lex.c
diff --git a/parse.c b/ecilib/parse.c
similarity index 100%
rename from parse.c
rename to ecilib/parse.c
diff --git a/picoc.c b/ecilib/picoc.c
similarity index 100%
rename from picoc.c
rename to ecilib/picoc.c
diff --git a/picoc.h b/ecilib/picoc.h
similarity index 100%
rename from picoc.h
rename to ecilib/picoc.h
diff --git a/platform.c b/ecilib/platform.c
similarity index 100%
rename from platform.c
rename to ecilib/platform.c
diff --git a/platform.h b/ecilib/platform.h
similarity index 99%
rename from platform.h
rename to ecilib/platform.h
index 1ff9ba0..d4150d0 100644
--- a/platform.h
+++ b/ecilib/platform.h
@@ -47,7 +47,7 @@
 # ifndef NO_FP
 #  include <math.h>
 #  define PICOC_MATH_LIBRARY
-#  define USE_READLINE
+/*#  define USE_READLINE*/
 #  undef BIG_ENDIAN
 #  if defined(__powerpc__) || defined(__hppa__) || defined(__sparc__)
 #   define BIG_ENDIAN
diff --git a/platform/library_ffox.c b/ecilib/platform/library_ffox.c
similarity index 100%
rename from platform/library_ffox.c
rename to ecilib/platform/library_ffox.c
diff --git a/platform/library_srv1.c b/ecilib/platform/library_srv1.c
similarity index 100%
rename from platform/library_srv1.c
rename to ecilib/platform/library_srv1.c
diff --git a/platform/library_surveyor.c b/ecilib/platform/library_surveyor.c
similarity index 100%
rename from platform/library_surveyor.c
rename to ecilib/platform/library_surveyor.c
diff --git a/platform/library_unix.c b/ecilib/platform/library_unix.c
similarity index 100%
rename from platform/library_unix.c
rename to ecilib/platform/library_unix.c
diff --git a/platform/platform_ffox.c b/ecilib/platform/platform_ffox.c
similarity index 100%
rename from platform/platform_ffox.c
rename to ecilib/platform/platform_ffox.c
diff --git a/platform/platform_surveyor.c b/ecilib/platform/platform_surveyor.c
similarity index 100%
rename from platform/platform_surveyor.c
rename to ecilib/platform/platform_surveyor.c
diff --git a/platform/platform_unix.c b/ecilib/platform/platform_unix.c
similarity index 100%
rename from platform/platform_unix.c
rename to ecilib/platform/platform_unix.c
diff --git a/table.c b/ecilib/table.c
similarity index 100%
rename from table.c
rename to ecilib/table.c
diff --git a/type.c b/ecilib/type.c
similarity index 100%
rename from type.c
rename to ecilib/type.c
diff --git a/variable.c b/ecilib/variable.c
similarity index 100%
rename from variable.c
rename to ecilib/variable.c