diff --git a/AUTHORS b/avrdude/AUTHORS
similarity index 100%
rename from AUTHORS
rename to avrdude/AUTHORS
diff --git a/BUILD-FROM-SVN b/avrdude/BUILD-FROM-SVN
similarity index 100%
rename from BUILD-FROM-SVN
rename to avrdude/BUILD-FROM-SVN
diff --git a/COPYING b/avrdude/COPYING
similarity index 100%
rename from COPYING
rename to avrdude/COPYING
diff --git a/ChangeLog b/avrdude/ChangeLog
similarity index 100%
rename from ChangeLog
rename to avrdude/ChangeLog
diff --git a/ChangeLog-2001 b/avrdude/ChangeLog-2001
similarity index 100%
rename from ChangeLog-2001
rename to avrdude/ChangeLog-2001
diff --git a/ChangeLog-2002 b/avrdude/ChangeLog-2002
similarity index 100%
rename from ChangeLog-2002
rename to avrdude/ChangeLog-2002
diff --git a/ChangeLog-2003 b/avrdude/ChangeLog-2003
similarity index 100%
rename from ChangeLog-2003
rename to avrdude/ChangeLog-2003
diff --git a/ChangeLog-2004-2006 b/avrdude/ChangeLog-2004-2006
similarity index 100%
rename from ChangeLog-2004-2006
rename to avrdude/ChangeLog-2004-2006
diff --git a/ChangeLog-2007 b/avrdude/ChangeLog-2007
similarity index 100%
rename from ChangeLog-2007
rename to avrdude/ChangeLog-2007
diff --git a/ChangeLog-2008 b/avrdude/ChangeLog-2008
similarity index 100%
rename from ChangeLog-2008
rename to avrdude/ChangeLog-2008
diff --git a/ChangeLog-2009 b/avrdude/ChangeLog-2009
similarity index 100%
rename from ChangeLog-2009
rename to avrdude/ChangeLog-2009
diff --git a/ChangeLog-2010 b/avrdude/ChangeLog-2010
similarity index 100%
rename from ChangeLog-2010
rename to avrdude/ChangeLog-2010
diff --git a/ChangeLog-2011 b/avrdude/ChangeLog-2011
similarity index 100%
rename from ChangeLog-2011
rename to avrdude/ChangeLog-2011
diff --git a/ChangeLog-2012 b/avrdude/ChangeLog-2012
similarity index 100%
rename from ChangeLog-2012
rename to avrdude/ChangeLog-2012
diff --git a/ChangeLog-2013 b/avrdude/ChangeLog-2013
similarity index 100%
rename from ChangeLog-2013
rename to avrdude/ChangeLog-2013
diff --git a/Makefile.am b/avrdude/Makefile.am
similarity index 100%
rename from Makefile.am
rename to avrdude/Makefile.am
diff --git a/NEWS b/avrdude/NEWS
similarity index 100%
rename from NEWS
rename to avrdude/NEWS
diff --git a/README b/avrdude/README
similarity index 100%
rename from README
rename to avrdude/README
diff --git a/arduino.c b/avrdude/arduino.c
similarity index 100%
rename from arduino.c
rename to avrdude/arduino.c
diff --git a/arduino.h b/avrdude/arduino.h
similarity index 100%
rename from arduino.h
rename to avrdude/arduino.h
diff --git a/avr.c b/avrdude/avr.c
similarity index 100%
rename from avr.c
rename to avrdude/avr.c
diff --git a/avr.h b/avrdude/avr.h
similarity index 100%
rename from avr.h
rename to avrdude/avr.h
diff --git a/avr910.c b/avrdude/avr910.c
similarity index 100%
rename from avr910.c
rename to avrdude/avr910.c
diff --git a/avr910.h b/avrdude/avr910.h
similarity index 100%
rename from avr910.h
rename to avrdude/avr910.h
diff --git a/avrdude.1 b/avrdude/avrdude.1
similarity index 100%
rename from avrdude.1
rename to avrdude/avrdude.1
diff --git a/avrdude.conf.in b/avrdude/avrdude.conf.in
similarity index 100%
rename from avrdude.conf.in
rename to avrdude/avrdude.conf.in
diff --git a/avrdude.h b/avrdude/avrdude.h
similarity index 100%
rename from avrdude.h
rename to avrdude/avrdude.h
diff --git a/avrdude.spec.in b/avrdude/avrdude.spec.in
similarity index 100%
rename from avrdude.spec.in
rename to avrdude/avrdude.spec.in
diff --git a/avrftdi.c b/avrdude/avrftdi.c
similarity index 100%
rename from avrftdi.c
rename to avrdude/avrftdi.c
diff --git a/avrftdi.h b/avrdude/avrftdi.h
similarity index 100%
rename from avrftdi.h
rename to avrdude/avrftdi.h
diff --git a/avrftdi_private.h b/avrdude/avrftdi_private.h
similarity index 100%
rename from avrftdi_private.h
rename to avrdude/avrftdi_private.h
diff --git a/avrftdi_tpi.c b/avrdude/avrftdi_tpi.c
similarity index 100%
rename from avrftdi_tpi.c
rename to avrdude/avrftdi_tpi.c
diff --git a/avrftdi_tpi.h b/avrdude/avrftdi_tpi.h
similarity index 100%
rename from avrftdi_tpi.h
rename to avrdude/avrftdi_tpi.h
diff --git a/avrpart.c b/avrdude/avrpart.c
similarity index 100%
rename from avrpart.c
rename to avrdude/avrpart.c
diff --git a/avrpart.h b/avrdude/avrpart.h
similarity index 100%
rename from avrpart.h
rename to avrdude/avrpart.h
diff --git a/bitbang.c b/avrdude/bitbang.c
similarity index 100%
rename from bitbang.c
rename to avrdude/bitbang.c
diff --git a/bitbang.h b/avrdude/bitbang.h
similarity index 100%
rename from bitbang.h
rename to avrdude/bitbang.h
diff --git a/bootstrap b/avrdude/bootstrap
similarity index 100%
rename from bootstrap
rename to avrdude/bootstrap
diff --git a/buspirate.c b/avrdude/buspirate.c
similarity index 100%
rename from buspirate.c
rename to avrdude/buspirate.c
diff --git a/buspirate.h b/avrdude/buspirate.h
similarity index 100%
rename from buspirate.h
rename to avrdude/buspirate.h
diff --git a/butterfly.c b/avrdude/butterfly.c
similarity index 100%
rename from butterfly.c
rename to avrdude/butterfly.c
diff --git a/butterfly.h b/avrdude/butterfly.h
similarity index 100%
rename from butterfly.h
rename to avrdude/butterfly.h
diff --git a/config.c b/avrdude/config.c
similarity index 100%
rename from config.c
rename to avrdude/config.c
diff --git a/config.h b/avrdude/config.h
similarity index 100%
rename from config.h
rename to avrdude/config.h
diff --git a/config_gram.y b/avrdude/config_gram.y
similarity index 100%
rename from config_gram.y
rename to avrdude/config_gram.y
diff --git a/configure.ac b/avrdude/configure.ac
similarity index 100%
rename from configure.ac
rename to avrdude/configure.ac
diff --git a/confwin.c b/avrdude/confwin.c
similarity index 100%
rename from confwin.c
rename to avrdude/confwin.c
diff --git a/confwin.h b/avrdude/confwin.h
similarity index 100%
rename from confwin.h
rename to avrdude/confwin.h
diff --git a/crc16.c b/avrdude/crc16.c
similarity index 100%
rename from crc16.c
rename to avrdude/crc16.c
diff --git a/crc16.h b/avrdude/crc16.h
similarity index 100%
rename from crc16.h
rename to avrdude/crc16.h
diff --git a/dfu.c b/avrdude/dfu.c
similarity index 100%
rename from dfu.c
rename to avrdude/dfu.c
diff --git a/dfu.h b/avrdude/dfu.h
similarity index 100%
rename from dfu.h
rename to avrdude/dfu.h
diff --git a/doc/.cvsignore b/avrdude/doc/.cvsignore
similarity index 100%
rename from doc/.cvsignore
rename to avrdude/doc/.cvsignore
diff --git a/doc/Makefile.am b/avrdude/doc/Makefile.am
similarity index 100%
rename from doc/Makefile.am
rename to avrdude/doc/Makefile.am
diff --git a/doc/TODO b/avrdude/doc/TODO
similarity index 100%
rename from doc/TODO
rename to avrdude/doc/TODO
diff --git a/doc/avrdude.texi b/avrdude/doc/avrdude.texi
similarity index 100%
rename from doc/avrdude.texi
rename to avrdude/doc/avrdude.texi
diff --git a/doc/parts_comments.txt b/avrdude/doc/parts_comments.txt
similarity index 100%
rename from doc/parts_comments.txt
rename to avrdude/doc/parts_comments.txt
diff --git a/fileio.c b/avrdude/fileio.c
similarity index 100%
rename from fileio.c
rename to avrdude/fileio.c
diff --git a/fileio.h b/avrdude/fileio.h
similarity index 100%
rename from fileio.h
rename to avrdude/fileio.h
diff --git a/flip1.c b/avrdude/flip1.c
similarity index 100%
rename from flip1.c
rename to avrdude/flip1.c
diff --git a/flip1.h b/avrdude/flip1.h
similarity index 100%
rename from flip1.h
rename to avrdude/flip1.h
diff --git a/flip2.c b/avrdude/flip2.c
similarity index 100%
rename from flip2.c
rename to avrdude/flip2.c
diff --git a/flip2.h b/avrdude/flip2.h
similarity index 100%
rename from flip2.h
rename to avrdude/flip2.h
diff --git a/freebsd_ppi.h b/avrdude/freebsd_ppi.h
similarity index 100%
rename from freebsd_ppi.h
rename to avrdude/freebsd_ppi.h
diff --git a/ft245r.c b/avrdude/ft245r.c
similarity index 100%
rename from ft245r.c
rename to avrdude/ft245r.c
diff --git a/ft245r.h b/avrdude/ft245r.h
similarity index 100%
rename from ft245r.h
rename to avrdude/ft245r.h
diff --git a/jtag3.c b/avrdude/jtag3.c
similarity index 100%
rename from jtag3.c
rename to avrdude/jtag3.c
diff --git a/jtag3.h b/avrdude/jtag3.h
similarity index 100%
rename from jtag3.h
rename to avrdude/jtag3.h
diff --git a/jtag3_private.h b/avrdude/jtag3_private.h
similarity index 100%
rename from jtag3_private.h
rename to avrdude/jtag3_private.h
diff --git a/jtagmkI.c b/avrdude/jtagmkI.c
similarity index 100%
rename from jtagmkI.c
rename to avrdude/jtagmkI.c
diff --git a/jtagmkI.h b/avrdude/jtagmkI.h
similarity index 100%
rename from jtagmkI.h
rename to avrdude/jtagmkI.h
diff --git a/jtagmkII.c b/avrdude/jtagmkII.c
similarity index 100%
rename from jtagmkII.c
rename to avrdude/jtagmkII.c
diff --git a/jtagmkII.h b/avrdude/jtagmkII.h
similarity index 100%
rename from jtagmkII.h
rename to avrdude/jtagmkII.h
diff --git a/jtagmkII_private.h b/avrdude/jtagmkII_private.h
similarity index 100%
rename from jtagmkII_private.h
rename to avrdude/jtagmkII_private.h
diff --git a/jtagmkI_private.h b/avrdude/jtagmkI_private.h
similarity index 100%
rename from jtagmkI_private.h
rename to avrdude/jtagmkI_private.h
diff --git a/lexer.l b/avrdude/lexer.l
similarity index 100%
rename from lexer.l
rename to avrdude/lexer.l
diff --git a/linux_ppdev.h b/avrdude/linux_ppdev.h
similarity index 100%
rename from linux_ppdev.h
rename to avrdude/linux_ppdev.h
diff --git a/linuxgpio.c b/avrdude/linuxgpio.c
similarity index 100%
rename from linuxgpio.c
rename to avrdude/linuxgpio.c
diff --git a/linuxgpio.h b/avrdude/linuxgpio.h
similarity index 100%
rename from linuxgpio.h
rename to avrdude/linuxgpio.h
diff --git a/lists.c b/avrdude/lists.c
similarity index 100%
rename from lists.c
rename to avrdude/lists.c
diff --git a/lists.h b/avrdude/lists.h
similarity index 100%
rename from lists.h
rename to avrdude/lists.h
diff --git a/main.c b/avrdude/main.c
similarity index 100%
rename from main.c
rename to avrdude/main.c
diff --git a/my_ddk_hidsdi.h b/avrdude/my_ddk_hidsdi.h
similarity index 100%
rename from my_ddk_hidsdi.h
rename to avrdude/my_ddk_hidsdi.h
diff --git a/par.c b/avrdude/par.c
similarity index 100%
rename from par.c
rename to avrdude/par.c
diff --git a/par.h b/avrdude/par.h
similarity index 100%
rename from par.h
rename to avrdude/par.h
diff --git a/pgm.c b/avrdude/pgm.c
similarity index 100%
rename from pgm.c
rename to avrdude/pgm.c
diff --git a/pgm.h b/avrdude/pgm.h
similarity index 100%
rename from pgm.h
rename to avrdude/pgm.h
diff --git a/pgm_type.c b/avrdude/pgm_type.c
similarity index 100%
rename from pgm_type.c
rename to avrdude/pgm_type.c
diff --git a/pgm_type.h b/avrdude/pgm_type.h
similarity index 100%
rename from pgm_type.h
rename to avrdude/pgm_type.h
diff --git a/pickit2.c b/avrdude/pickit2.c
similarity index 100%
rename from pickit2.c
rename to avrdude/pickit2.c
diff --git a/pickit2.h b/avrdude/pickit2.h
similarity index 100%
rename from pickit2.h
rename to avrdude/pickit2.h
diff --git a/pindefs.c b/avrdude/pindefs.c
similarity index 100%
rename from pindefs.c
rename to avrdude/pindefs.c
diff --git a/pindefs.h b/avrdude/pindefs.h
similarity index 100%
rename from pindefs.h
rename to avrdude/pindefs.h
diff --git a/ppi.c b/avrdude/ppi.c
similarity index 100%
rename from ppi.c
rename to avrdude/ppi.c
diff --git a/ppi.h b/avrdude/ppi.h
similarity index 100%
rename from ppi.h
rename to avrdude/ppi.h
diff --git a/ppiwin.c b/avrdude/ppiwin.c
similarity index 100%
rename from ppiwin.c
rename to avrdude/ppiwin.c
diff --git a/safemode.c b/avrdude/safemode.c
similarity index 100%
rename from safemode.c
rename to avrdude/safemode.c
diff --git a/safemode.h b/avrdude/safemode.h
similarity index 100%
rename from safemode.h
rename to avrdude/safemode.h
diff --git a/ser_avrdoper.c b/avrdude/ser_avrdoper.c
similarity index 100%
rename from ser_avrdoper.c
rename to avrdude/ser_avrdoper.c
diff --git a/ser_posix.c b/avrdude/ser_posix.c
similarity index 100%
rename from ser_posix.c
rename to avrdude/ser_posix.c
diff --git a/ser_win32.c b/avrdude/ser_win32.c
similarity index 100%
rename from ser_win32.c
rename to avrdude/ser_win32.c
diff --git a/serbb.h b/avrdude/serbb.h
similarity index 100%
rename from serbb.h
rename to avrdude/serbb.h
diff --git a/serbb_posix.c b/avrdude/serbb_posix.c
similarity index 100%
rename from serbb_posix.c
rename to avrdude/serbb_posix.c
diff --git a/serbb_win32.c b/avrdude/serbb_win32.c
similarity index 100%
rename from serbb_win32.c
rename to avrdude/serbb_win32.c
diff --git a/serial.h b/avrdude/serial.h
similarity index 100%
rename from serial.h
rename to avrdude/serial.h
diff --git a/solaris_ecpp.h b/avrdude/solaris_ecpp.h
similarity index 100%
rename from solaris_ecpp.h
rename to avrdude/solaris_ecpp.h
diff --git a/stk500.c b/avrdude/stk500.c
similarity index 100%
rename from stk500.c
rename to avrdude/stk500.c
diff --git a/stk500.h b/avrdude/stk500.h
similarity index 100%
rename from stk500.h
rename to avrdude/stk500.h
diff --git a/stk500_private.h b/avrdude/stk500_private.h
similarity index 100%
rename from stk500_private.h
rename to avrdude/stk500_private.h
diff --git a/stk500generic.c b/avrdude/stk500generic.c
similarity index 100%
rename from stk500generic.c
rename to avrdude/stk500generic.c
diff --git a/stk500generic.h b/avrdude/stk500generic.h
similarity index 100%
rename from stk500generic.h
rename to avrdude/stk500generic.h
diff --git a/stk500v2.c b/avrdude/stk500v2.c
similarity index 100%
rename from stk500v2.c
rename to avrdude/stk500v2.c
diff --git a/stk500v2.h b/avrdude/stk500v2.h
similarity index 100%
rename from stk500v2.h
rename to avrdude/stk500v2.h
diff --git a/stk500v2_private.h b/avrdude/stk500v2_private.h
similarity index 100%
rename from stk500v2_private.h
rename to avrdude/stk500v2_private.h
diff --git a/term.c b/avrdude/term.c
similarity index 100%
rename from term.c
rename to avrdude/term.c
diff --git a/term.h b/avrdude/term.h
similarity index 100%
rename from term.h
rename to avrdude/term.h
diff --git a/tools/build-mingw32.sh b/avrdude/tools/build-mingw32.sh
similarity index 100%
rename from tools/build-mingw32.sh
rename to avrdude/tools/build-mingw32.sh
diff --git a/tools/get-dw-params.xsl b/avrdude/tools/get-dw-params.xsl
similarity index 100%
rename from tools/get-dw-params.xsl
rename to avrdude/tools/get-dw-params.xsl
diff --git a/tools/get-hv-params.xsl b/avrdude/tools/get-hv-params.xsl
similarity index 100%
rename from tools/get-hv-params.xsl
rename to avrdude/tools/get-hv-params.xsl
diff --git a/tools/get-stk600-cards.xsl b/avrdude/tools/get-stk600-cards.xsl
similarity index 100%
rename from tools/get-stk600-cards.xsl
rename to avrdude/tools/get-stk600-cards.xsl
diff --git a/tools/get-stk600-devices.xsl b/avrdude/tools/get-stk600-devices.xsl
similarity index 100%
rename from tools/get-stk600-devices.xsl
rename to avrdude/tools/get-stk600-devices.xsl
diff --git a/tpi.h b/avrdude/tpi.h
similarity index 100%
rename from tpi.h
rename to avrdude/tpi.h
diff --git a/update.c b/avrdude/update.c
similarity index 100%
rename from update.c
rename to avrdude/update.c
diff --git a/update.h b/avrdude/update.h
similarity index 100%
rename from update.h
rename to avrdude/update.h
diff --git a/usb_libusb.c b/avrdude/usb_libusb.c
similarity index 100%
rename from usb_libusb.c
rename to avrdude/usb_libusb.c
diff --git a/usbasp.c b/avrdude/usbasp.c
similarity index 100%
rename from usbasp.c
rename to avrdude/usbasp.c
diff --git a/usbasp.h b/avrdude/usbasp.h
similarity index 100%
rename from usbasp.h
rename to avrdude/usbasp.h
diff --git a/usbdevs.h b/avrdude/usbdevs.h
similarity index 100%
rename from usbdevs.h
rename to avrdude/usbdevs.h
diff --git a/usbtiny.c b/avrdude/usbtiny.c
similarity index 100%
rename from usbtiny.c
rename to avrdude/usbtiny.c
diff --git a/usbtiny.h b/avrdude/usbtiny.h
similarity index 100%
rename from usbtiny.h
rename to avrdude/usbtiny.h
diff --git a/windows/.cvsignore b/avrdude/windows/.cvsignore
similarity index 100%
rename from windows/.cvsignore
rename to avrdude/windows/.cvsignore
diff --git a/windows/Makefile.am b/avrdude/windows/Makefile.am
similarity index 100%
rename from windows/Makefile.am
rename to avrdude/windows/Makefile.am
diff --git a/windows/giveio.c b/avrdude/windows/giveio.c
similarity index 100%
rename from windows/giveio.c
rename to avrdude/windows/giveio.c
diff --git a/windows/giveio.sys b/avrdude/windows/giveio.sys
similarity index 100%
rename from windows/giveio.sys
rename to avrdude/windows/giveio.sys
diff --git a/windows/install_giveio.bat b/avrdude/windows/install_giveio.bat
similarity index 100%
rename from windows/install_giveio.bat
rename to avrdude/windows/install_giveio.bat
diff --git a/windows/loaddrv.c b/avrdude/windows/loaddrv.c
similarity index 100%
rename from windows/loaddrv.c
rename to avrdude/windows/loaddrv.c
diff --git a/windows/loaddrv.h b/avrdude/windows/loaddrv.h
similarity index 100%
rename from windows/loaddrv.h
rename to avrdude/windows/loaddrv.h
diff --git a/windows/remove_giveio.bat b/avrdude/windows/remove_giveio.bat
similarity index 100%
rename from windows/remove_giveio.bat
rename to avrdude/windows/remove_giveio.bat
diff --git a/windows/status_giveio.bat b/avrdude/windows/status_giveio.bat
similarity index 100%
rename from windows/status_giveio.bat
rename to avrdude/windows/status_giveio.bat
diff --git a/wiring.c b/avrdude/wiring.c
similarity index 100%
rename from wiring.c
rename to avrdude/wiring.c
diff --git a/wiring.h b/avrdude/wiring.h
similarity index 100%
rename from wiring.h
rename to avrdude/wiring.h