Improved directory structure with the source code under src

27 files changed, 17 insertions, 13 deletions

diff --git a/README b/README
index 4d57acb..ba52e97 100644
--- a/README
+++ b/README
@@ -1,25 +1,29 @@
 Zopfli Compression Algorithm is a compression library programmed in C to perform
 very good, but slow, deflate or zlib compression.
 
-zopfli.c is separate from the library and contains an example program to create
-very well compressed gzip files.
+The basic function to compress data is ZopfliCompress in zopfli.h. Use the
+ZopfliOptions object to set parameters that affect the speed and compression.
+Use the ZopfliInitOptions function to place the default values in the
+ZopfliOptions first.
 
-The basic functions to compress data are ZopfliDeflate in deflate.h,
-ZopfliZlibCompress in zlib_container.h and ZopfliGzipCompress in
-gzip_container.h, or ZopfliCompress in zopfli.h.
-Use the ZopfliOptions object to set parameters that affect the speed and
-compression. Use the ZopfliInitOptions function to place the default values in
-the ZopfliOptions first.
+ZopfliCompress supports deflate, gzip and zlib output format with a parameter.
+To support only one individual format, you can instead use ZopfliDeflate in
+deflate.h, ZopfliZlibCompress in zlib_container.h or ZopfliGzipCompress in
+gzip_container.h.
 
-Deflate creates a valid deflate stream in memory, see:
+ZopfliDeflate creates a valid deflate stream in memory, see:
 http://www.ietf.org/rfc/rfc1951.txt
-ZlibCompress creates a valid zlib stream in memory, see:
+ZopfliZlibCompress creates a valid zlib stream in memory, see:
 http://www.ietf.org/rfc/rfc1950.txt
-GzipCompress creates a valid gzip stream in memory, see:
+ZopfliGzipCompress creates a valid gzip stream in memory, see:
 http://www.ietf.org/rfc/rfc1952.txt
 
 This library can only compress, not decompress. Existing zlib or deflate
 libraries can decompress the data.
 
+zopfli_bin.c is separate from the library and contains an example program to
+create very well compressed gzip files. Currently the makefile builds this
+program with the library statically linked in.
+
 Zopfli Compression Algorithm was created by Lode Vandevenne and Jyrki
 Alakuijala, based on an algorithm by Jyrki Alakuijala.
diff --git a/makefile b/makefile
index 3215957..7e3272c 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 make:
-	gcc *.c -O2 -W -Wall -Wextra -ansi -pedantic -lm -o zopfli
+	gcc src/zopfli/*.c -O2 -W -Wall -Wextra -ansi -pedantic -lm -o zopfli
 
 debug:
-	gcc *.c -g3 -lm -o zopfli
+	gcc src/zopfli/*.c -g3 -lm -o zopfli
diff --git a/blocksplitter.c b/src/zopfli/blocksplitter.c
index 9c2c40e..9c2c40e 100644
--- a/blocksplitter.c
+++ b/src/zopfli/blocksplitter.c
diff --git a/blocksplitter.h b/src/zopfli/blocksplitter.h
index 6791702..6791702 100644
--- a/blocksplitter.h
+++ b/src/zopfli/blocksplitter.h
diff --git a/cache.c b/src/zopfli/cache.c
index 88a49ac..88a49ac 100644
--- a/cache.c
+++ b/src/zopfli/cache.c
diff --git a/cache.h b/src/zopfli/cache.h
index 5ca0c50..5ca0c50 100644
--- a/cache.h
+++ b/src/zopfli/cache.h
diff --git a/deflate.c b/src/zopfli/deflate.c
index 713c6ae..713c6ae 100644
--- a/deflate.c
+++ b/src/zopfli/deflate.c
diff --git a/deflate.h b/src/zopfli/deflate.h
index c53f8be..c53f8be 100644
--- a/deflate.h
+++ b/src/zopfli/deflate.h
diff --git a/gzip_container.c b/src/zopfli/gzip_container.c
index 8a062f2..8a062f2 100644
--- a/gzip_container.c
+++ b/src/zopfli/gzip_container.c
diff --git a/gzip_container.h b/src/zopfli/gzip_container.h
index fdbc6b5..fdbc6b5 100644
--- a/gzip_container.h
+++ b/src/zopfli/gzip_container.h
diff --git a/hash.c b/src/zopfli/hash.c
index a3b294f..a3b294f 100644
--- a/hash.c
+++ b/src/zopfli/hash.c
diff --git a/hash.h b/src/zopfli/hash.h
index 79c2479..79c2479 100644
--- a/hash.h
+++ b/src/zopfli/hash.h
diff --git a/katajainen.c b/src/zopfli/katajainen.c
index 783ea08..783ea08 100644
--- a/katajainen.c
+++ b/src/zopfli/katajainen.c
diff --git a/katajainen.h b/src/zopfli/katajainen.h
index ee8a91e..ee8a91e 100644
--- a/katajainen.h
+++ b/src/zopfli/katajainen.h
diff --git a/lz77.c b/src/zopfli/lz77.c
index 26186b4..26186b4 100644
--- a/lz77.c
+++ b/src/zopfli/lz77.c
diff --git a/lz77.h b/src/zopfli/lz77.h
index df65ace..df65ace 100644
--- a/lz77.h
+++ b/src/zopfli/lz77.h
diff --git a/squeeze.c b/src/zopfli/squeeze.c
index 09e7e2e..09e7e2e 100644
--- a/squeeze.c
+++ b/src/zopfli/squeeze.c
diff --git a/squeeze.h b/src/zopfli/squeeze.h
index e850aaa..e850aaa 100644
--- a/squeeze.h
+++ b/src/zopfli/squeeze.h
diff --git a/tree.c b/src/zopfli/tree.c
index c457511..c457511 100644
--- a/tree.c
+++ b/src/zopfli/tree.c
diff --git a/tree.h b/src/zopfli/tree.h
index 4d6f469..4d6f469 100644
--- a/tree.h
+++ b/src/zopfli/tree.h
diff --git a/util.c b/src/zopfli/util.c
index d207145..d207145 100644
--- a/util.c
+++ b/src/zopfli/util.c
diff --git a/util.h b/src/zopfli/util.h
index 4188f51..4188f51 100644
--- a/util.h
+++ b/src/zopfli/util.h
diff --git a/zlib_container.c b/src/zopfli/zlib_container.c
index 5b7d0aa..5b7d0aa 100644
--- a/zlib_container.c
+++ b/src/zopfli/zlib_container.c
diff --git a/zlib_container.h b/src/zopfli/zlib_container.h
index e83dadc..e83dadc 100644
--- a/zlib_container.h
+++ b/src/zopfli/zlib_container.h
diff --git a/zopfli.h b/src/zopfli/zopfli.h
index 9350b65..9350b65 100644
--- a/zopfli.h
+++ b/src/zopfli/zopfli.h
diff --git a/zopfli_bin.c b/src/zopfli/zopfli_bin.c
index 8a147ef..8a147ef 100644
--- a/zopfli_bin.c
+++ b/src/zopfli/zopfli_bin.c
diff --git a/zopfli_lib.c b/src/zopfli/zopfli_lib.c
index b2280e8..b2280e8 100644
--- a/zopfli_lib.c
+++ b/src/zopfli/zopfli_lib.c