diff --git a/pam_usb/COPYING b/COPYING
similarity index 100%
rename from pam_usb/COPYING
rename to COPYING
diff --git a/pam_usb/ChangeLog b/ChangeLog
similarity index 100%
rename from pam_usb/ChangeLog
rename to ChangeLog
diff --git a/pam_usb/Makefile b/Makefile
similarity index 100%
rename from pam_usb/Makefile
rename to Makefile
diff --git a/pam_usb/doc/CONFIGURATION b/doc/CONFIGURATION
similarity index 100%
rename from pam_usb/doc/CONFIGURATION
rename to doc/CONFIGURATION
diff --git a/pam_usb/doc/FAQ b/doc/FAQ
similarity index 100%
rename from pam_usb/doc/FAQ
rename to doc/FAQ
diff --git a/pam_usb/doc/QUICKSTART b/doc/QUICKSTART
similarity index 100%
rename from pam_usb/doc/QUICKSTART
rename to doc/QUICKSTART
diff --git a/pam_usb/doc/UPGRADING b/doc/UPGRADING
similarity index 100%
rename from pam_usb/doc/UPGRADING
rename to doc/UPGRADING
diff --git a/pam_usb/doc/pamusb-agent.1.gz b/doc/pamusb-agent.1.gz
similarity index 100%
rename from pam_usb/doc/pamusb-agent.1.gz
rename to doc/pamusb-agent.1.gz
diff --git a/pam_usb/doc/pamusb-check.1.gz b/doc/pamusb-check.1.gz
similarity index 100%
rename from pam_usb/doc/pamusb-check.1.gz
rename to doc/pamusb-check.1.gz
diff --git a/pam_usb/doc/pamusb-conf.1.gz b/doc/pamusb-conf.1.gz
similarity index 100%
rename from pam_usb/doc/pamusb-conf.1.gz
rename to doc/pamusb-conf.1.gz
diff --git a/pam_usb/doc/pamusb.conf b/doc/pamusb.conf
similarity index 100%
rename from pam_usb/doc/pamusb.conf
rename to doc/pamusb.conf
diff --git a/pam_usb/src/conf.c b/src/conf.c
similarity index 100%
rename from pam_usb/src/conf.c
rename to src/conf.c
diff --git a/pam_usb/src/conf.h b/src/conf.h
similarity index 100%
rename from pam_usb/src/conf.h
rename to src/conf.h
diff --git a/pam_usb/src/device.c b/src/device.c
similarity index 100%
rename from pam_usb/src/device.c
rename to src/device.c
diff --git a/pam_usb/src/device.h b/src/device.h
similarity index 100%
rename from pam_usb/src/device.h
rename to src/device.h
diff --git a/pam_usb/src/hal.c b/src/hal.c
similarity index 100%
rename from pam_usb/src/hal.c
rename to src/hal.c
diff --git a/pam_usb/src/hal.h b/src/hal.h
similarity index 100%
rename from pam_usb/src/hal.h
rename to src/hal.h
diff --git a/pam_usb/src/local.c b/src/local.c
similarity index 100%
rename from pam_usb/src/local.c
rename to src/local.c
diff --git a/pam_usb/src/local.h b/src/local.h
similarity index 100%
rename from pam_usb/src/local.h
rename to src/local.h
diff --git a/pam_usb/src/log.c b/src/log.c
similarity index 100%
rename from pam_usb/src/log.c
rename to src/log.c
diff --git a/pam_usb/src/log.h b/src/log.h
similarity index 100%
rename from pam_usb/src/log.h
rename to src/log.h
diff --git a/pam_usb/src/pad.c b/src/pad.c
similarity index 100%
rename from pam_usb/src/pad.c
rename to src/pad.c
diff --git a/pam_usb/src/pad.h b/src/pad.h
similarity index 100%
rename from pam_usb/src/pad.h
rename to src/pad.h
diff --git a/pam_usb/src/pam.c b/src/pam.c
similarity index 100%
rename from pam_usb/src/pam.c
rename to src/pam.c
diff --git a/pam_usb/src/pamusb-check.c b/src/pamusb-check.c
similarity index 100%
rename from pam_usb/src/pamusb-check.c
rename to src/pamusb-check.c
diff --git a/pam_usb/src/version.h b/src/version.h
similarity index 100%
rename from pam_usb/src/version.h
rename to src/version.h
diff --git a/pam_usb/src/volume.c b/src/volume.c
similarity index 100%
rename from pam_usb/src/volume.c
rename to src/volume.c
diff --git a/pam_usb/src/volume.h b/src/volume.h
similarity index 100%
rename from pam_usb/src/volume.h
rename to src/volume.h
diff --git a/pam_usb/src/xpath.c b/src/xpath.c
similarity index 100%
rename from pam_usb/src/xpath.c
rename to src/xpath.c
diff --git a/pam_usb/src/xpath.h b/src/xpath.h
similarity index 100%
rename from pam_usb/src/xpath.h
rename to src/xpath.h
diff --git a/pam_usb/tools/pamusb-agent b/tools/pamusb-agent
similarity index 100%
rename from pam_usb/tools/pamusb-agent
rename to tools/pamusb-agent
diff --git a/pam_usb/tools/pamusb-conf b/tools/pamusb-conf
similarity index 100%
rename from pam_usb/tools/pamusb-conf
rename to tools/pamusb-conf
diff --git a/pam_usb/utils/fetch_doc.rb b/utils/fetch_doc.rb
similarity index 100%
rename from pam_usb/utils/fetch_doc.rb
rename to utils/fetch_doc.rb
diff --git a/pam_usb/utils/hal_device_tree.rb b/utils/hal_device_tree.rb
similarity index 100%
rename from pam_usb/utils/hal_device_tree.rb
rename to utils/hal_device_tree.rb
diff --git a/pam_usb/utils/roll_release.sh b/utils/roll_release.sh
similarity index 100%
rename from pam_usb/utils/roll_release.sh
rename to utils/roll_release.sh