diff --git a/bic.c b/lib/bic.c
similarity index 100%
rename from bic.c
rename to lib/bic.c
diff --git a/bitpack.c b/lib/bitpack.c
similarity index 100%
rename from bitpack.c
rename to lib/bitpack.c
diff --git a/bitpack_.h b/lib/bitpack_.h
similarity index 100%
rename from bitpack_.h
rename to lib/bitpack_.h
diff --git a/bitunpack.c b/lib/bitunpack.c
similarity index 100%
rename from bitunpack.c
rename to lib/bitunpack.c
diff --git a/bitunpack_.h b/lib/bitunpack_.h
similarity index 100%
rename from bitunpack_.h
rename to lib/bitunpack_.h
diff --git a/bitutil.c b/lib/bitutil.c
similarity index 100%
rename from bitutil.c
rename to lib/bitutil.c
diff --git a/eliasfano.c b/lib/eliasfano.c
similarity index 100%
rename from eliasfano.c
rename to lib/eliasfano.c
diff --git a/fp.c b/lib/fp.c
similarity index 100%
rename from fp.c
rename to lib/fp.c
diff --git a/icapp.c b/lib/icapp.c
similarity index 100%
rename from icapp.c
rename to lib/icapp.c
diff --git a/iccodec.c b/lib/iccodec.c
similarity index 100%
rename from iccodec.c
rename to lib/iccodec.c
diff --git a/idx.h b/lib/idx.h
similarity index 100%
rename from idx.h
rename to lib/idx.h
diff --git a/idxcr.c b/lib/idxcr.c
similarity index 100%
rename from idxcr.c
rename to lib/idxcr.c
diff --git a/idxqry.c b/lib/idxqry.c
similarity index 100%
rename from idxqry.c
rename to lib/idxqry.c
diff --git a/idxseg.c b/lib/idxseg.c
similarity index 100%
rename from idxseg.c
rename to lib/idxseg.c
diff --git a/include_/bic.h b/lib/include_/bic.h
similarity index 100%
rename from include_/bic.h
rename to lib/include_/bic.h
diff --git a/include_/bitiobe.h b/lib/include_/bitiobe.h
similarity index 100%
rename from include_/bitiobe.h
rename to lib/include_/bitiobe.h
diff --git a/include_/bitpack.h b/lib/include_/bitpack.h
similarity index 100%
rename from include_/bitpack.h
rename to lib/include_/bitpack.h
diff --git a/include_/bitutil.h b/lib/include_/bitutil.h
similarity index 100%
rename from include_/bitutil.h
rename to lib/include_/bitutil.h
diff --git a/include_/bitutil_.h b/lib/include_/bitutil_.h
similarity index 100%
rename from include_/bitutil_.h
rename to lib/include_/bitutil_.h
diff --git a/include_/conf.h b/lib/include_/conf.h
similarity index 100%
rename from include_/conf.h
rename to lib/include_/conf.h
diff --git a/include_/eliasfano.h b/lib/include_/eliasfano.h
similarity index 100%
rename from include_/eliasfano.h
rename to lib/include_/eliasfano.h
diff --git a/include_/fp.h b/lib/include_/fp.h
similarity index 100%
rename from include_/fp.h
rename to lib/include_/fp.h
diff --git a/include_/iccodec.h b/lib/include_/iccodec.h
similarity index 100%
rename from include_/iccodec.h
rename to lib/include_/iccodec.h
diff --git a/include_/sse_neon.h b/lib/include_/sse_neon.h
similarity index 100%
rename from include_/sse_neon.h
rename to lib/include_/sse_neon.h
diff --git a/include_/time_.h b/lib/include_/time_.h
similarity index 100%
rename from include_/time_.h
rename to lib/include_/time_.h
diff --git a/include_/transpose.h b/lib/include_/transpose.h
similarity index 100%
rename from include_/transpose.h
rename to lib/include_/transpose.h
diff --git a/include_/trle.h b/lib/include_/trle.h
similarity index 100%
rename from include_/trle.h
rename to lib/include_/trle.h
diff --git a/include_/vbit.h b/lib/include_/vbit.h
similarity index 100%
rename from include_/vbit.h
rename to lib/include_/vbit.h
diff --git a/include_/vint.h b/lib/include_/vint.h
similarity index 100%
rename from include_/vint.h
rename to lib/include_/vint.h
diff --git a/include_/vlcbit.h b/lib/include_/vlcbit.h
similarity index 100%
rename from include_/vlcbit.h
rename to lib/include_/vlcbit.h
diff --git a/include_/vlcbyte.h b/lib/include_/vlcbyte.h
similarity index 100%
rename from include_/vlcbyte.h
rename to lib/include_/vlcbyte.h
diff --git a/include_/vp4.h b/lib/include_/vp4.h
similarity index 100%
rename from include_/vp4.h
rename to lib/include_/vp4.h
diff --git a/include_/vsimple.h b/lib/include_/vsimple.h
similarity index 100%
rename from include_/vsimple.h
rename to lib/include_/vsimple.h
diff --git a/jic.c b/lib/jic.c
similarity index 100%
rename from jic.c
rename to lib/jic.c
diff --git a/jic.h b/lib/jic.h
similarity index 100%
rename from jic.h
rename to lib/jic.h
diff --git a/transpose.c b/lib/transpose.c
similarity index 100%
rename from transpose.c
rename to lib/transpose.c
diff --git a/transpose_.c b/lib/transpose_.c
similarity index 100%
rename from transpose_.c
rename to lib/transpose_.c
diff --git a/trle.c b/lib/trle.c
similarity index 100%
rename from trle.c
rename to lib/trle.c
diff --git a/trle_.h b/lib/trle_.h
similarity index 100%
rename from trle_.h
rename to lib/trle_.h
diff --git a/trlec.c b/lib/trlec.c
similarity index 100%
rename from trlec.c
rename to lib/trlec.c
diff --git a/trled.c b/lib/trled.c
similarity index 100%
rename from trled.c
rename to lib/trled.c
diff --git a/v8.c b/lib/v8.c
similarity index 100%
rename from v8.c
rename to lib/v8.c
diff --git a/v8pack.c b/lib/v8pack.c
similarity index 100%
rename from v8pack.c
rename to lib/v8pack.c
diff --git a/vbit.c b/lib/vbit.c
similarity index 100%
rename from vbit.c
rename to lib/vbit.c
diff --git a/vint.c b/lib/vint.c
similarity index 100%
rename from vint.c
rename to lib/vint.c
diff --git a/vp4c.c b/lib/vp4c.c
similarity index 100%
rename from vp4c.c
rename to lib/vp4c.c
diff --git a/vp4d.c b/lib/vp4d.c
similarity index 100%
rename from vp4d.c
rename to lib/vp4d.c
diff --git a/vsimple.c b/lib/vsimple.c
similarity index 100%
rename from vsimple.c
rename to lib/vsimple.c