diff --git a/httperf/AUTHORS b/AUTHORS
similarity index 100%
rename from httperf/AUTHORS
rename to AUTHORS
diff --git a/httperf/COPYRIGHT b/COPYRIGHT
similarity index 100%
rename from httperf/COPYRIGHT
rename to COPYRIGHT
diff --git a/httperf/ChangeLog b/ChangeLog
similarity index 100%
rename from httperf/ChangeLog
rename to ChangeLog
diff --git a/httperf/Makefile.am b/Makefile.am
similarity index 100%
rename from httperf/Makefile.am
rename to Makefile.am
diff --git a/httperf/NEWS b/NEWS
similarity index 100%
rename from httperf/NEWS
rename to NEWS
diff --git a/httperf/README b/README
similarity index 100%
rename from httperf/README
rename to README
diff --git a/httperf/TODO b/TODO
similarity index 100%
rename from httperf/TODO
rename to TODO
diff --git a/httperf/configure.ac b/configure.ac
similarity index 100%
rename from httperf/configure.ac
rename to configure.ac
diff --git a/httperf/man/Makefile.am b/man/Makefile.am
similarity index 100%
rename from httperf/man/Makefile.am
rename to man/Makefile.am
diff --git a/httperf/man/httperf.1 b/man/httperf.1
similarity index 100%
rename from httperf/man/httperf.1
rename to man/httperf.1
diff --git a/httperf/src/Makefile.am b/src/Makefile.am
similarity index 100%
rename from httperf/src/Makefile.am
rename to src/Makefile.am
diff --git a/httperf/src/call.c b/src/call.c
similarity index 100%
rename from httperf/src/call.c
rename to src/call.c
diff --git a/httperf/src/call.h b/src/call.h
similarity index 100%
rename from httperf/src/call.h
rename to src/call.h
diff --git a/httperf/src/conn.c b/src/conn.c
similarity index 100%
rename from httperf/src/conn.c
rename to src/conn.c
diff --git a/httperf/src/conn.h b/src/conn.h
similarity index 100%
rename from httperf/src/conn.h
rename to src/conn.h
diff --git a/httperf/src/core.c b/src/core.c
similarity index 100%
rename from httperf/src/core.c
rename to src/core.c
diff --git a/httperf/src/core.h b/src/core.h
similarity index 100%
rename from httperf/src/core.h
rename to src/core.h
diff --git a/httperf/src/gen/Makefile.am b/src/gen/Makefile.am
similarity index 100%
rename from httperf/src/gen/Makefile.am
rename to src/gen/Makefile.am
diff --git a/httperf/src/gen/call_seq.c b/src/gen/call_seq.c
similarity index 100%
rename from httperf/src/gen/call_seq.c
rename to src/gen/call_seq.c
diff --git a/httperf/src/gen/conn_rate.c b/src/gen/conn_rate.c
similarity index 100%
rename from httperf/src/gen/conn_rate.c
rename to src/gen/conn_rate.c
diff --git a/httperf/src/gen/misc.c b/src/gen/misc.c
similarity index 100%
rename from httperf/src/gen/misc.c
rename to src/gen/misc.c
diff --git a/httperf/src/gen/rate.c b/src/gen/rate.c
similarity index 100%
rename from httperf/src/gen/rate.c
rename to src/gen/rate.c
diff --git a/httperf/src/gen/rate.h b/src/gen/rate.h
similarity index 100%
rename from httperf/src/gen/rate.h
rename to src/gen/rate.h
diff --git a/httperf/src/gen/sess_cookie.c b/src/gen/sess_cookie.c
similarity index 100%
rename from httperf/src/gen/sess_cookie.c
rename to src/gen/sess_cookie.c
diff --git a/httperf/src/gen/session.c b/src/gen/session.c
similarity index 100%
rename from httperf/src/gen/session.c
rename to src/gen/session.c
diff --git a/httperf/src/gen/session.h b/src/gen/session.h
similarity index 100%
rename from httperf/src/gen/session.h
rename to src/gen/session.h
diff --git a/httperf/src/gen/uri_fixed.c b/src/gen/uri_fixed.c
similarity index 100%
rename from httperf/src/gen/uri_fixed.c
rename to src/gen/uri_fixed.c
diff --git a/httperf/src/gen/uri_wlog.c b/src/gen/uri_wlog.c
similarity index 100%
rename from httperf/src/gen/uri_wlog.c
rename to src/gen/uri_wlog.c
diff --git a/httperf/src/gen/uri_wset.c b/src/gen/uri_wset.c
similarity index 100%
rename from httperf/src/gen/uri_wset.c
rename to src/gen/uri_wset.c
diff --git a/httperf/src/gen/wsess.c b/src/gen/wsess.c
similarity index 100%
rename from httperf/src/gen/wsess.c
rename to src/gen/wsess.c
diff --git a/httperf/src/gen/wsesslog.c b/src/gen/wsesslog.c
similarity index 100%
rename from httperf/src/gen/wsesslog.c
rename to src/gen/wsesslog.c
diff --git a/httperf/src/gen/wsesspage.c b/src/gen/wsesspage.c
similarity index 100%
rename from httperf/src/gen/wsesspage.c
rename to src/gen/wsesspage.c
diff --git a/httperf/src/http.c b/src/http.c
similarity index 100%
rename from httperf/src/http.c
rename to src/http.c
diff --git a/httperf/src/http.h b/src/http.h
similarity index 100%
rename from httperf/src/http.h
rename to src/http.h
diff --git a/httperf/src/httperf.c b/src/httperf.c
similarity index 100%
rename from httperf/src/httperf.c
rename to src/httperf.c
diff --git a/httperf/src/httperf.h b/src/httperf.h
similarity index 100%
rename from httperf/src/httperf.h
rename to src/httperf.h
diff --git a/httperf/src/idleconn.c b/src/idleconn.c
similarity index 100%
rename from httperf/src/idleconn.c
rename to src/idleconn.c
diff --git a/httperf/src/lib/Makefile.am b/src/lib/Makefile.am
similarity index 100%
rename from httperf/src/lib/Makefile.am
rename to src/lib/Makefile.am
diff --git a/httperf/src/lib/README b/src/lib/README
similarity index 100%
rename from httperf/src/lib/README
rename to src/lib/README
diff --git a/httperf/src/lib/generic_types.h b/src/lib/generic_types.h
similarity index 100%
rename from httperf/src/lib/generic_types.h
rename to src/lib/generic_types.h
diff --git a/httperf/src/lib/getopt.c b/src/lib/getopt.c
similarity index 100%
rename from httperf/src/lib/getopt.c
rename to src/lib/getopt.c
diff --git a/httperf/src/lib/getopt.h b/src/lib/getopt.h
similarity index 100%
rename from httperf/src/lib/getopt.h
rename to src/lib/getopt.h
diff --git a/httperf/src/lib/heap.c b/src/lib/heap.c
similarity index 100%
rename from httperf/src/lib/heap.c
rename to src/lib/heap.c
diff --git a/httperf/src/lib/heap.h b/src/lib/heap.h
similarity index 100%
rename from httperf/src/lib/heap.h
rename to src/lib/heap.h
diff --git a/httperf/src/lib/list.c b/src/lib/list.c
similarity index 100%
rename from httperf/src/lib/list.c
rename to src/lib/list.c
diff --git a/httperf/src/lib/list.h b/src/lib/list.h
similarity index 100%
rename from httperf/src/lib/list.h
rename to src/lib/list.h
diff --git a/httperf/src/lib/queue.c b/src/lib/queue.c
similarity index 100%
rename from httperf/src/lib/queue.c
rename to src/lib/queue.c
diff --git a/httperf/src/lib/queue.h b/src/lib/queue.h
similarity index 100%
rename from httperf/src/lib/queue.h
rename to src/lib/queue.h
diff --git a/httperf/src/lib/ssl_writev.c b/src/lib/ssl_writev.c
similarity index 100%
rename from httperf/src/lib/ssl_writev.c
rename to src/lib/ssl_writev.c
diff --git a/httperf/src/localevent.c b/src/localevent.c
similarity index 100%
rename from httperf/src/localevent.c
rename to src/localevent.c
diff --git a/httperf/src/localevent.h b/src/localevent.h
similarity index 100%
rename from httperf/src/localevent.h
rename to src/localevent.h
diff --git a/httperf/src/object.c b/src/object.c
similarity index 100%
rename from httperf/src/object.c
rename to src/object.c
diff --git a/httperf/src/object.h b/src/object.h
similarity index 100%
rename from httperf/src/object.h
rename to src/object.h
diff --git a/httperf/src/sess.c b/src/sess.c
similarity index 100%
rename from httperf/src/sess.c
rename to src/sess.c
diff --git a/httperf/src/sess.h b/src/sess.h
similarity index 100%
rename from httperf/src/sess.h
rename to src/sess.h
diff --git a/httperf/src/stat/Makefile.am b/src/stat/Makefile.am
similarity index 100%
rename from httperf/src/stat/Makefile.am
rename to src/stat/Makefile.am
diff --git a/httperf/src/stat/basic.c b/src/stat/basic.c
similarity index 100%
rename from httperf/src/stat/basic.c
rename to src/stat/basic.c
diff --git a/httperf/src/stat/print_reply.c b/src/stat/print_reply.c
similarity index 100%
rename from httperf/src/stat/print_reply.c
rename to src/stat/print_reply.c
diff --git a/httperf/src/stat/sess_stat.c b/src/stat/sess_stat.c
similarity index 100%
rename from httperf/src/stat/sess_stat.c
rename to src/stat/sess_stat.c
diff --git a/httperf/src/stat/stats.h b/src/stat/stats.h
similarity index 100%
rename from httperf/src/stat/stats.h
rename to src/stat/stats.h
diff --git a/httperf/src/timer.c b/src/timer.c
similarity index 100%
rename from httperf/src/timer.c
rename to src/timer.c
diff --git a/httperf/src/timer.h b/src/timer.h
similarity index 100%
rename from httperf/src/timer.h
rename to src/timer.h