diff --git a/address.h b/include/coap/address.h
similarity index 100%
rename from address.h
rename to include/coap/address.h
diff --git a/async.h b/include/coap/async.h
similarity index 100%
rename from async.h
rename to include/coap/async.h
diff --git a/bits.h b/include/coap/bits.h
similarity index 100%
rename from bits.h
rename to include/coap/bits.h
diff --git a/block.h b/include/coap/block.h
similarity index 100%
rename from block.h
rename to include/coap/block.h
diff --git a/coap.h b/include/coap/coap.h
similarity index 100%
rename from coap.h
rename to include/coap/coap.h
diff --git a/coap_io.h b/include/coap/coap_io.h
similarity index 100%
rename from coap_io.h
rename to include/coap/coap_io.h
diff --git a/coap_time.h b/include/coap/coap_time.h
similarity index 100%
rename from coap_time.h
rename to include/coap/coap_time.h
diff --git a/debug.h b/include/coap/debug.h
similarity index 100%
rename from debug.h
rename to include/coap/debug.h
diff --git a/encode.h b/include/coap/encode.h
similarity index 100%
rename from encode.h
rename to include/coap/encode.h
diff --git a/hashkey.h b/include/coap/hashkey.h
similarity index 100%
rename from hashkey.h
rename to include/coap/hashkey.h
diff --git a/lwippools.h b/include/coap/lwippools.h
similarity index 100%
rename from lwippools.h
rename to include/coap/lwippools.h
diff --git a/mem.h b/include/coap/mem.h
similarity index 100%
rename from mem.h
rename to include/coap/mem.h
diff --git a/net.h b/include/coap/net.h
similarity index 100%
rename from net.h
rename to include/coap/net.h
diff --git a/option.h b/include/coap/option.h
similarity index 100%
rename from option.h
rename to include/coap/option.h
diff --git a/pdu.h b/include/coap/pdu.h
similarity index 100%
rename from pdu.h
rename to include/coap/pdu.h
diff --git a/prng.h b/include/coap/prng.h
similarity index 100%
rename from prng.h
rename to include/coap/prng.h
diff --git a/resource.h b/include/coap/resource.h
similarity index 100%
rename from resource.h
rename to include/coap/resource.h
diff --git a/str.h b/include/coap/str.h
similarity index 100%
rename from str.h
rename to include/coap/str.h
diff --git a/subscribe.h b/include/coap/subscribe.h
similarity index 100%
rename from subscribe.h
rename to include/coap/subscribe.h
diff --git a/t_list.h b/include/coap/t_list.h
similarity index 100%
rename from t_list.h
rename to include/coap/t_list.h
diff --git a/uri.h b/include/coap/uri.h
similarity index 100%
rename from uri.h
rename to include/coap/uri.h
diff --git a/uthash.h b/include/coap/uthash.h
similarity index 100%
rename from uthash.h
rename to include/coap/uthash.h
diff --git a/utlist.h b/include/coap/utlist.h
similarity index 100%
rename from utlist.h
rename to include/coap/utlist.h
diff --git a/async.c b/src/async.c
similarity index 100%
rename from async.c
rename to src/async.c
diff --git a/block.c b/src/block.c
similarity index 100%
rename from block.c
rename to src/block.c
diff --git a/coap_io.c b/src/coap_io.c
similarity index 100%
rename from coap_io.c
rename to src/coap_io.c
diff --git a/debug.c b/src/debug.c
similarity index 100%
rename from debug.c
rename to src/debug.c
diff --git a/encode.c b/src/encode.c
similarity index 100%
rename from encode.c
rename to src/encode.c
diff --git a/hashkey.c b/src/hashkey.c
similarity index 100%
rename from hashkey.c
rename to src/hashkey.c
diff --git a/mem.c b/src/mem.c
similarity index 100%
rename from mem.c
rename to src/mem.c
diff --git a/net.c b/src/net.c
similarity index 100%
rename from net.c
rename to src/net.c
diff --git a/option.c b/src/option.c
similarity index 100%
rename from option.c
rename to src/option.c
diff --git a/pdu.c b/src/pdu.c
similarity index 100%
rename from pdu.c
rename to src/pdu.c
diff --git a/resource.c b/src/resource.c
similarity index 100%
rename from resource.c
rename to src/resource.c
diff --git a/str.c b/src/str.c
similarity index 100%
rename from str.c
rename to src/str.c
diff --git a/subscribe.c b/src/subscribe.c
similarity index 100%
rename from subscribe.c
rename to src/subscribe.c
diff --git a/uri.c b/src/uri.c
similarity index 100%
rename from uri.c
rename to src/uri.c