diff --git a/.gitignore b/.gitignore
index 16bb88b..e1bc67a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
-iw
-*~
-*.o
-.config
-version.c
-iw.8.gz
-*-stamp
+iw/iw
+iw/*~
+iw/*.o
+iw/.config
+iw/version.c
+iw/iw.8.gz
+iw/*-stamp
diff --git a/Android.mk b/iw/Android.mk
similarity index 100%
rename from Android.mk
rename to iw/Android.mk
diff --git a/CONTRIBUTING b/iw/CONTRIBUTING
similarity index 100%
rename from CONTRIBUTING
rename to iw/CONTRIBUTING
diff --git a/COPYING b/iw/COPYING
similarity index 100%
rename from COPYING
rename to iw/COPYING
diff --git a/Makefile b/iw/Makefile
similarity index 100%
rename from Makefile
rename to iw/Makefile
diff --git a/README b/iw/README
similarity index 100%
rename from README
rename to iw/README
diff --git a/ap.c b/iw/ap.c
similarity index 100%
rename from ap.c
rename to iw/ap.c
diff --git a/bitrate.c b/iw/bitrate.c
similarity index 100%
rename from bitrate.c
rename to iw/bitrate.c
diff --git a/coalesce.c b/iw/coalesce.c
similarity index 100%
rename from coalesce.c
rename to iw/coalesce.c
diff --git a/connect.c b/iw/connect.c
similarity index 100%
rename from connect.c
rename to iw/connect.c
diff --git a/cqm.c b/iw/cqm.c
similarity index 100%
rename from cqm.c
rename to iw/cqm.c
diff --git a/event.c b/iw/event.c
similarity index 100%
rename from event.c
rename to iw/event.c
diff --git a/genl.c b/iw/genl.c
similarity index 100%
rename from genl.c
rename to iw/genl.c
diff --git a/hwsim.c b/iw/hwsim.c
similarity index 100%
rename from hwsim.c
rename to iw/hwsim.c
diff --git a/ibss.c b/iw/ibss.c
similarity index 100%
rename from ibss.c
rename to iw/ibss.c
diff --git a/ieee80211.h b/iw/ieee80211.h
similarity index 100%
rename from ieee80211.h
rename to iw/ieee80211.h
diff --git a/info.c b/iw/info.c
similarity index 100%
rename from info.c
rename to iw/info.c
diff --git a/interface.c b/iw/interface.c
similarity index 100%
rename from interface.c
rename to iw/interface.c
diff --git a/iw.8 b/iw/iw.8
similarity index 100%
rename from iw.8
rename to iw/iw.8
diff --git a/iw.c b/iw/iw.c
similarity index 100%
rename from iw.c
rename to iw/iw.c
diff --git a/iw.h b/iw/iw.h
similarity index 100%
rename from iw.h
rename to iw/iw.h
diff --git a/link.c b/iw/link.c
similarity index 100%
rename from link.c
rename to iw/link.c
diff --git a/measurements.c b/iw/measurements.c
similarity index 100%
rename from measurements.c
rename to iw/measurements.c
diff --git a/mesh.c b/iw/mesh.c
similarity index 100%
rename from mesh.c
rename to iw/mesh.c
diff --git a/mgmt.c b/iw/mgmt.c
similarity index 100%
rename from mgmt.c
rename to iw/mgmt.c
diff --git a/mpath.c b/iw/mpath.c
similarity index 100%
rename from mpath.c
rename to iw/mpath.c
diff --git a/mpp.c b/iw/mpp.c
similarity index 100%
rename from mpp.c
rename to iw/mpp.c
diff --git a/nl80211.h b/iw/nl80211.h
similarity index 100%
rename from nl80211.h
rename to iw/nl80211.h
diff --git a/ocb.c b/iw/ocb.c
similarity index 100%
rename from ocb.c
rename to iw/ocb.c
diff --git a/offch.c b/iw/offch.c
similarity index 100%
rename from offch.c
rename to iw/offch.c
diff --git a/p2p.c b/iw/p2p.c
similarity index 100%
rename from p2p.c
rename to iw/p2p.c
diff --git a/phy.c b/iw/phy.c
similarity index 100%
rename from phy.c
rename to iw/phy.c
diff --git a/ps.c b/iw/ps.c
similarity index 100%
rename from ps.c
rename to iw/ps.c
diff --git a/reason.c b/iw/reason.c
similarity index 100%
rename from reason.c
rename to iw/reason.c
diff --git a/reg.c b/iw/reg.c
similarity index 100%
rename from reg.c
rename to iw/reg.c
diff --git a/roc.c b/iw/roc.c
similarity index 100%
rename from roc.c
rename to iw/roc.c
diff --git a/scan.c b/iw/scan.c
similarity index 100%
rename from scan.c
rename to iw/scan.c
diff --git a/sections.c b/iw/sections.c
similarity index 100%
rename from sections.c
rename to iw/sections.c
diff --git a/station.c b/iw/station.c
similarity index 100%
rename from station.c
rename to iw/station.c
diff --git a/status.c b/iw/status.c
similarity index 100%
rename from status.c
rename to iw/status.c
diff --git a/survey.c b/iw/survey.c
similarity index 100%
rename from survey.c
rename to iw/survey.c
diff --git a/util.c b/iw/util.c
similarity index 100%
rename from util.c
rename to iw/util.c
diff --git a/vendor.c b/iw/vendor.c
similarity index 100%
rename from vendor.c
rename to iw/vendor.c
diff --git a/version.sh b/iw/version.sh
similarity index 100%
rename from version.sh
rename to iw/version.sh
diff --git a/wowlan.c b/iw/wowlan.c
similarity index 100%
rename from wowlan.c
rename to iw/wowlan.c