diff --git a/ibdump/Makefile b/Makefile
similarity index 100%
rename from ibdump/Makefile
rename to Makefile
diff --git a/ibdump/Makefile.win b/Makefile.win
similarity index 100%
rename from ibdump/Makefile.win
rename to Makefile.win
diff --git a/ibdump/SOURCES b/SOURCES
similarity index 100%
rename from ibdump/SOURCES
rename to SOURCES
diff --git a/ibdump/bit_slice.h b/bit_slice.h
similarity index 100%
rename from ibdump/bit_slice.h
rename to bit_slice.h
diff --git a/ibdump/bus_ioctl.h b/bus_ioctl.h
similarity index 100%
rename from ibdump/bus_ioctl.h
rename to bus_ioctl.h
diff --git a/ibdump/compatibility.h b/compatibility.h
similarity index 100%
rename from ibdump/compatibility.h
rename to compatibility.h
diff --git a/ibdump/debian/changelog b/debian/changelog
similarity index 100%
rename from ibdump/debian/changelog
rename to debian/changelog
diff --git a/ibdump/debian/compat b/debian/compat
similarity index 100%
rename from ibdump/debian/compat
rename to debian/compat
diff --git a/ibdump/debian/control b/debian/control
similarity index 100%
rename from ibdump/debian/control
rename to debian/control
diff --git a/ibdump/debian/copyright b/debian/copyright
similarity index 100%
rename from ibdump/debian/copyright
rename to debian/copyright
diff --git a/ibdump/debian/rules b/debian/rules
similarity index 100%
rename from ibdump/debian/rules
rename to debian/rules
diff --git a/ibdump/debian/source/format b/debian/source/format
similarity index 100%
rename from ibdump/debian/source/format
rename to debian/source/format
diff --git a/ibdump/getopt.c b/getopt.c
similarity index 100%
rename from ibdump/getopt.c
rename to getopt.c
diff --git a/ibdump/getopt.h b/getopt.h
similarity index 100%
rename from ibdump/getopt.h
rename to getopt.h
diff --git a/ibdump/gitversion.h b/gitversion.h
similarity index 100%
rename from ibdump/gitversion.h
rename to gitversion.h
diff --git a/ibdump/gitversion.sh b/gitversion.sh
similarity index 100%
rename from ibdump/gitversion.sh
rename to gitversion.sh
diff --git a/ibdump/ibd_device.h b/ibd_device.h
similarity index 100%
rename from ibdump/ibd_device.h
rename to ibd_device.h
diff --git a/ibdump/ibd_hw_access.c b/ibd_hw_access.c
similarity index 100%
rename from ibdump/ibd_hw_access.c
rename to ibd_hw_access.c
diff --git a/ibdump/ibd_hw_access.h b/ibd_hw_access.h
similarity index 100%
rename from ibdump/ibd_hw_access.h
rename to ibd_hw_access.h
diff --git a/ibdump/ibd_ibal_access.c b/ibd_ibal_access.c
similarity index 100%
rename from ibdump/ibd_ibal_access.c
rename to ibd_ibal_access.c
diff --git a/ibdump/ibd_ibal_access.h b/ibd_ibal_access.h
similarity index 100%
rename from ibdump/ibd_ibal_access.h
rename to ibd_ibal_access.h
diff --git a/ibdump/ibdump.c b/ibdump.c
similarity index 100%
rename from ibdump/ibdump.c
rename to ibdump.c
diff --git a/ibdump/ibdump.h b/ibdump.h
similarity index 100%
rename from ibdump/ibdump.h
rename to ibdump.h
diff --git a/ibdump/ibdump.sln b/ibdump.sln
similarity index 100%
rename from ibdump/ibdump.sln
rename to ibdump.sln
diff --git a/ibdump/ibdump.spec b/ibdump.spec
similarity index 100%
rename from ibdump/ibdump.spec
rename to ibdump.spec
diff --git a/ibdump/ibdump.vcxproj b/ibdump.vcxproj
similarity index 100%
rename from ibdump/ibdump.vcxproj
rename to ibdump.vcxproj
diff --git a/ibdump/.gitignore b/ibdump/.gitignore
deleted file mode 100644
index 6e22d5c..0000000
--- a/ibdump/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-debian/.debhelper/
-debian/files
-debian/ibdump.debhelper.log
-debian/ibdump.substvars
-debian/ibdump/
-ibdump
-ibdump.d
-ibdump.o
diff --git a/ibdump/inttypes.h b/inttypes.h
similarity index 100%
rename from ibdump/inttypes.h
rename to inttypes.h
diff --git a/ibdump/sources.props b/sources.props
similarity index 100%
rename from ibdump/sources.props
rename to sources.props
diff --git a/ibdump/stdint.h b/stdint.h
similarity index 100%
rename from ibdump/stdint.h
rename to stdint.h
diff --git a/ibdump/time_compat.h b/time_compat.h
similarity index 100%
rename from ibdump/time_compat.h
rename to time_compat.h
diff --git a/ibdump/tools_version.h b/tools_version.h
similarity index 100%
rename from ibdump/tools_version.h
rename to tools_version.h
diff --git a/ibdump/vpi_tcpdump b/vpi_tcpdump
similarity index 100%
rename from ibdump/vpi_tcpdump
rename to vpi_tcpdump