diff --git a/emul/charclass.h b/compat/charclass.h
similarity index 100%
rename from emul/charclass.h
rename to compat/charclass.h
diff --git a/closefrom.c b/compat/closefrom.c
similarity index 100%
rename from closefrom.c
rename to compat/closefrom.c
diff --git a/fnmatch.c b/compat/fnmatch.c
similarity index 100%
rename from fnmatch.c
rename to compat/fnmatch.c
diff --git a/emul/fnmatch.h b/compat/fnmatch.h
similarity index 100%
rename from emul/fnmatch.h
rename to compat/fnmatch.h
diff --git a/getcwd.c b/compat/getcwd.c
similarity index 100%
rename from getcwd.c
rename to compat/getcwd.c
diff --git a/getline.c b/compat/getline.c
similarity index 100%
rename from getline.c
rename to compat/getline.c
diff --git a/getprogname.c b/compat/getprogname.c
similarity index 100%
rename from getprogname.c
rename to compat/getprogname.c
diff --git a/glob.c b/compat/glob.c
similarity index 100%
rename from glob.c
rename to compat/glob.c
diff --git a/emul/glob.h b/compat/glob.h
similarity index 100%
rename from emul/glob.h
rename to compat/glob.h
diff --git a/isblank.c b/compat/isblank.c
similarity index 100%
rename from isblank.c
rename to compat/isblank.c
diff --git a/memrchr.c b/compat/memrchr.c
similarity index 100%
rename from memrchr.c
rename to compat/memrchr.c
diff --git a/mkstemp.c b/compat/mkstemp.c
similarity index 100%
rename from mkstemp.c
rename to compat/mkstemp.c
diff --git a/nanosleep.c b/compat/nanosleep.c
similarity index 100%
rename from nanosleep.c
rename to compat/nanosleep.c
diff --git a/sigaction.c b/compat/sigaction.c
similarity index 100%
rename from sigaction.c
rename to compat/sigaction.c
diff --git a/snprintf.c b/compat/snprintf.c
similarity index 100%
rename from snprintf.c
rename to compat/snprintf.c
diff --git a/strcasecmp.c b/compat/strcasecmp.c
similarity index 100%
rename from strcasecmp.c
rename to compat/strcasecmp.c
diff --git a/strerror.c b/compat/strerror.c
similarity index 100%
rename from strerror.c
rename to compat/strerror.c
diff --git a/strlcat.c b/compat/strlcat.c
similarity index 100%
rename from strlcat.c
rename to compat/strlcat.c
diff --git a/strlcpy.c b/compat/strlcpy.c
similarity index 100%
rename from strlcpy.c
rename to compat/strlcpy.c
diff --git a/strsignal.c b/compat/strsignal.c
similarity index 100%
rename from strsignal.c
rename to compat/strsignal.c
diff --git a/emul/timespec.h b/compat/timespec.h
similarity index 100%
rename from emul/timespec.h
rename to compat/timespec.h
diff --git a/emul/utime.h b/compat/utime.h
similarity index 100%
rename from emul/utime.h
rename to compat/utime.h
diff --git a/utimes.c b/compat/utimes.c
similarity index 100%
rename from utimes.c
rename to compat/utimes.c
diff --git a/HISTORY b/doc/HISTORY
similarity index 100%
rename from HISTORY
rename to doc/HISTORY
diff --git a/LICENSE b/doc/LICENSE
similarity index 100%
rename from LICENSE
rename to doc/LICENSE
diff --git a/PORTING b/doc/PORTING
similarity index 100%
rename from PORTING
rename to doc/PORTING
diff --git a/TROUBLESHOOTING b/doc/TROUBLESHOOTING
similarity index 100%
rename from TROUBLESHOOTING
rename to doc/TROUBLESHOOTING
diff --git a/UPGRADE b/doc/UPGRADE
similarity index 100%
rename from UPGRADE
rename to doc/UPGRADE
diff --git a/history.pod b/doc/history.pod
similarity index 100%
rename from history.pod
rename to doc/history.pod
diff --git a/license.pod b/doc/license.pod
similarity index 100%
rename from license.pod
rename to doc/license.pod
diff --git a/sample.pam b/doc/sample.pam
similarity index 100%
rename from sample.pam
rename to doc/sample.pam
diff --git a/sample.sudoers b/doc/sample.sudoers
similarity index 100%
rename from sample.sudoers
rename to doc/sample.sudoers
diff --git a/sample.syslog.conf b/doc/sample.syslog.conf
similarity index 100%
rename from sample.syslog.conf
rename to doc/sample.syslog.conf
diff --git a/schema.ActiveDirectory b/doc/schema.ActiveDirectory
similarity index 100%
rename from schema.ActiveDirectory
rename to doc/schema.ActiveDirectory
diff --git a/schema.OpenLDAP b/doc/schema.OpenLDAP
similarity index 100%
rename from schema.OpenLDAP
rename to doc/schema.OpenLDAP
diff --git a/schema.iPlanet b/doc/schema.iPlanet
similarity index 100%
rename from schema.iPlanet
rename to doc/schema.iPlanet
diff --git a/sudo.cat b/doc/sudo.cat
similarity index 100%
rename from sudo.cat
rename to doc/sudo.cat
diff --git a/sudo.man.in b/doc/sudo.man.in
similarity index 100%
rename from sudo.man.in
rename to doc/sudo.man.in
diff --git a/sudo.man.pl b/doc/sudo.man.pl
similarity index 100%
rename from sudo.man.pl
rename to doc/sudo.man.pl
diff --git a/sudo.pod b/doc/sudo.pod
similarity index 100%
rename from sudo.pod
rename to doc/sudo.pod
diff --git a/sudoers.cat b/doc/sudoers.cat
similarity index 100%
rename from sudoers.cat
rename to doc/sudoers.cat
diff --git a/sudoers.ldap.cat b/doc/sudoers.ldap.cat
similarity index 100%
rename from sudoers.ldap.cat
rename to doc/sudoers.ldap.cat
diff --git a/sudoers.ldap.man.in b/doc/sudoers.ldap.man.in
similarity index 100%
rename from sudoers.ldap.man.in
rename to doc/sudoers.ldap.man.in
diff --git a/sudoers.ldap.pod b/doc/sudoers.ldap.pod
similarity index 100%
rename from sudoers.ldap.pod
rename to doc/sudoers.ldap.pod
diff --git a/sudoers.man.in b/doc/sudoers.man.in
similarity index 100%
rename from sudoers.man.in
rename to doc/sudoers.man.in
diff --git a/sudoers.man.pl b/doc/sudoers.man.pl
similarity index 100%
rename from sudoers.man.pl
rename to doc/sudoers.man.pl
diff --git a/sudoers.pod b/doc/sudoers.pod
similarity index 100%
rename from sudoers.pod
rename to doc/sudoers.pod
diff --git a/sudoreplay.cat b/doc/sudoreplay.cat
similarity index 100%
rename from sudoreplay.cat
rename to doc/sudoreplay.cat
diff --git a/sudoreplay.man.in b/doc/sudoreplay.man.in
similarity index 100%
rename from sudoreplay.man.in
rename to doc/sudoreplay.man.in
diff --git a/sudoreplay.pod b/doc/sudoreplay.pod
similarity index 100%
rename from sudoreplay.pod
rename to doc/sudoreplay.pod
diff --git a/visudo.cat b/doc/visudo.cat
similarity index 100%
rename from visudo.cat
rename to doc/visudo.cat
diff --git a/visudo.man.in b/doc/visudo.man.in
similarity index 100%
rename from visudo.man.in
rename to doc/visudo.man.in
diff --git a/visudo.pod b/doc/visudo.pod
similarity index 100%
rename from visudo.pod
rename to doc/visudo.pod
diff --git a/alloc.h b/include/alloc.h
similarity index 100%
rename from alloc.h
rename to include/alloc.h
diff --git a/compat.h b/include/compat.h
similarity index 100%
rename from compat.h
rename to include/compat.h
diff --git a/error.h b/include/error.h
similarity index 100%
rename from error.h
rename to include/error.h
diff --git a/lbuf.h b/include/lbuf.h
similarity index 100%
rename from lbuf.h
rename to include/lbuf.h
diff --git a/list.h b/include/list.h
similarity index 100%
rename from list.h
rename to include/list.h
diff --git a/missing.h b/include/missing.h
similarity index 100%
rename from missing.h
rename to include/missing.h
diff --git a/Makefile.binary.in b/plugins/sudoers/Makefile.binary.in
similarity index 100%
rename from Makefile.binary.in
rename to plugins/sudoers/Makefile.binary.in
diff --git a/Makefile.in b/plugins/sudoers/Makefile.in
similarity index 100%
rename from Makefile.in
rename to plugins/sudoers/Makefile.in
diff --git a/aixcrypt.exp b/plugins/sudoers/aixcrypt.exp
similarity index 100%
rename from aixcrypt.exp
rename to plugins/sudoers/aixcrypt.exp
diff --git a/alias.c b/plugins/sudoers/alias.c
similarity index 100%
rename from alias.c
rename to plugins/sudoers/alias.c
diff --git a/auth/API b/plugins/sudoers/auth/API
similarity index 100%
rename from auth/API
rename to plugins/sudoers/auth/API
diff --git a/auth/afs.c b/plugins/sudoers/auth/afs.c
similarity index 100%
rename from auth/afs.c
rename to plugins/sudoers/auth/afs.c
diff --git a/auth/aix_auth.c b/plugins/sudoers/auth/aix_auth.c
similarity index 100%
rename from auth/aix_auth.c
rename to plugins/sudoers/auth/aix_auth.c
diff --git a/auth/bsdauth.c b/plugins/sudoers/auth/bsdauth.c
similarity index 100%
rename from auth/bsdauth.c
rename to plugins/sudoers/auth/bsdauth.c
diff --git a/auth/dce.c b/plugins/sudoers/auth/dce.c
similarity index 100%
rename from auth/dce.c
rename to plugins/sudoers/auth/dce.c
diff --git a/auth/fwtk.c b/plugins/sudoers/auth/fwtk.c
similarity index 100%
rename from auth/fwtk.c
rename to plugins/sudoers/auth/fwtk.c
diff --git a/auth/kerb4.c b/plugins/sudoers/auth/kerb4.c
similarity index 100%
rename from auth/kerb4.c
rename to plugins/sudoers/auth/kerb4.c
diff --git a/auth/kerb5.c b/plugins/sudoers/auth/kerb5.c
similarity index 100%
rename from auth/kerb5.c
rename to plugins/sudoers/auth/kerb5.c
diff --git a/auth/pam.c b/plugins/sudoers/auth/pam.c
similarity index 100%
rename from auth/pam.c
rename to plugins/sudoers/auth/pam.c
diff --git a/auth/passwd.c b/plugins/sudoers/auth/passwd.c
similarity index 100%
rename from auth/passwd.c
rename to plugins/sudoers/auth/passwd.c
diff --git a/auth/rfc1938.c b/plugins/sudoers/auth/rfc1938.c
similarity index 100%
rename from auth/rfc1938.c
rename to plugins/sudoers/auth/rfc1938.c
diff --git a/auth/secureware.c b/plugins/sudoers/auth/secureware.c
similarity index 100%
rename from auth/secureware.c
rename to plugins/sudoers/auth/secureware.c
diff --git a/auth/securid.c b/plugins/sudoers/auth/securid.c
similarity index 100%
rename from auth/securid.c
rename to plugins/sudoers/auth/securid.c
diff --git a/auth/securid5.c b/plugins/sudoers/auth/securid5.c
similarity index 100%
rename from auth/securid5.c
rename to plugins/sudoers/auth/securid5.c
diff --git a/auth/sia.c b/plugins/sudoers/auth/sia.c
similarity index 100%
rename from auth/sia.c
rename to plugins/sudoers/auth/sia.c
diff --git a/auth/sudo_auth.c b/plugins/sudoers/auth/sudo_auth.c
similarity index 100%
rename from auth/sudo_auth.c
rename to plugins/sudoers/auth/sudo_auth.c
diff --git a/auth/sudo_auth.h b/plugins/sudoers/auth/sudo_auth.h
similarity index 100%
rename from auth/sudo_auth.h
rename to plugins/sudoers/auth/sudo_auth.h
diff --git a/boottime.c b/plugins/sudoers/boottime.c
similarity index 100%
rename from boottime.c
rename to plugins/sudoers/boottime.c
diff --git a/check.c b/plugins/sudoers/check.c
similarity index 100%
rename from check.c
rename to plugins/sudoers/check.c
diff --git a/def_data.c b/plugins/sudoers/def_data.c
similarity index 100%
rename from def_data.c
rename to plugins/sudoers/def_data.c
diff --git a/def_data.h b/plugins/sudoers/def_data.h
similarity index 100%
rename from def_data.h
rename to plugins/sudoers/def_data.h
diff --git a/def_data.in b/plugins/sudoers/def_data.in
similarity index 100%
rename from def_data.in
rename to plugins/sudoers/def_data.in
diff --git a/defaults.c b/plugins/sudoers/defaults.c
similarity index 100%
rename from defaults.c
rename to plugins/sudoers/defaults.c
diff --git a/defaults.h b/plugins/sudoers/defaults.h
similarity index 100%
rename from defaults.h
rename to plugins/sudoers/defaults.h
diff --git a/env.c b/plugins/sudoers/env.c
similarity index 100%
rename from env.c
rename to plugins/sudoers/env.c
diff --git a/find_path.c b/plugins/sudoers/find_path.c
similarity index 100%
rename from find_path.c
rename to plugins/sudoers/find_path.c
diff --git a/getdate.c b/plugins/sudoers/getdate.c
similarity index 100%
rename from getdate.c
rename to plugins/sudoers/getdate.c
diff --git a/getdate.y b/plugins/sudoers/getdate.y
similarity index 100%
rename from getdate.y
rename to plugins/sudoers/getdate.y
diff --git a/getspwuid.c b/plugins/sudoers/getspwuid.c
similarity index 100%
rename from getspwuid.c
rename to plugins/sudoers/getspwuid.c
diff --git a/gettime.c b/plugins/sudoers/gettime.c
similarity index 100%
rename from gettime.c
rename to plugins/sudoers/gettime.c
diff --git a/goodpath.c b/plugins/sudoers/goodpath.c
similarity index 100%
rename from goodpath.c
rename to plugins/sudoers/goodpath.c
diff --git a/gram.c b/plugins/sudoers/gram.c
similarity index 100%
rename from gram.c
rename to plugins/sudoers/gram.c
diff --git a/gram.h b/plugins/sudoers/gram.h
similarity index 100%
rename from gram.h
rename to plugins/sudoers/gram.h
diff --git a/gram.y b/plugins/sudoers/gram.y
similarity index 100%
rename from gram.y
rename to plugins/sudoers/gram.y
diff --git a/ins_2001.h b/plugins/sudoers/ins_2001.h
similarity index 100%
rename from ins_2001.h
rename to plugins/sudoers/ins_2001.h
diff --git a/ins_classic.h b/plugins/sudoers/ins_classic.h
similarity index 100%
rename from ins_classic.h
rename to plugins/sudoers/ins_classic.h
diff --git a/ins_csops.h b/plugins/sudoers/ins_csops.h
similarity index 100%
rename from ins_csops.h
rename to plugins/sudoers/ins_csops.h
diff --git a/ins_goons.h b/plugins/sudoers/ins_goons.h
similarity index 100%
rename from ins_goons.h
rename to plugins/sudoers/ins_goons.h
diff --git a/install-sh b/plugins/sudoers/install-sh
similarity index 100%
rename from install-sh
rename to plugins/sudoers/install-sh
diff --git a/insults.h b/plugins/sudoers/insults.h
similarity index 100%
rename from insults.h
rename to plugins/sudoers/insults.h
diff --git a/interfaces.c b/plugins/sudoers/interfaces.c
similarity index 100%
rename from interfaces.c
rename to plugins/sudoers/interfaces.c
diff --git a/interfaces.h b/plugins/sudoers/interfaces.h
similarity index 100%
rename from interfaces.h
rename to plugins/sudoers/interfaces.h
diff --git a/ldap.c b/plugins/sudoers/ldap.c
similarity index 100%
rename from ldap.c
rename to plugins/sudoers/ldap.c
diff --git a/logging.c b/plugins/sudoers/logging.c
similarity index 100%
rename from logging.c
rename to plugins/sudoers/logging.c
diff --git a/logging.h b/plugins/sudoers/logging.h
similarity index 100%
rename from logging.h
rename to plugins/sudoers/logging.h
diff --git a/match.c b/plugins/sudoers/match.c
similarity index 100%
rename from match.c
rename to plugins/sudoers/match.c
diff --git a/mkdefaults b/plugins/sudoers/mkdefaults
similarity index 100%
rename from mkdefaults
rename to plugins/sudoers/mkdefaults
diff --git a/mon_systrace.c b/plugins/sudoers/mon_systrace.c
similarity index 100%
rename from mon_systrace.c
rename to plugins/sudoers/mon_systrace.c
diff --git a/mon_systrace.h b/plugins/sudoers/mon_systrace.h
similarity index 100%
rename from mon_systrace.h
rename to plugins/sudoers/mon_systrace.h
diff --git a/nonunix.h b/plugins/sudoers/nonunix.h
similarity index 100%
rename from nonunix.h
rename to plugins/sudoers/nonunix.h
diff --git a/parse.c b/plugins/sudoers/parse.c
similarity index 100%
rename from parse.c
rename to plugins/sudoers/parse.c
diff --git a/parse.h b/plugins/sudoers/parse.h
similarity index 100%
rename from parse.h
rename to plugins/sudoers/parse.h
diff --git a/pwutil.c b/plugins/sudoers/pwutil.c
similarity index 100%
rename from pwutil.c
rename to plugins/sudoers/pwutil.c
diff --git a/redblack.c b/plugins/sudoers/redblack.c
similarity index 100%
rename from redblack.c
rename to plugins/sudoers/redblack.c
diff --git a/redblack.h b/plugins/sudoers/redblack.h
similarity index 100%
rename from redblack.h
rename to plugins/sudoers/redblack.h
diff --git a/set_perms.c b/plugins/sudoers/set_perms.c
similarity index 100%
rename from set_perms.c
rename to plugins/sudoers/set_perms.c
diff --git a/sudo_nss.c b/plugins/sudoers/sudo_nss.c
similarity index 100%
rename from sudo_nss.c
rename to plugins/sudoers/sudo_nss.c
diff --git a/sudo_nss.h b/plugins/sudoers/sudo_nss.h
similarity index 100%
rename from sudo_nss.h
rename to plugins/sudoers/sudo_nss.h
diff --git a/sudoers b/plugins/sudoers/sudoers
similarity index 100%
rename from sudoers
rename to plugins/sudoers/sudoers
diff --git a/sudo.c b/plugins/sudoers/sudoers.c
similarity index 100%
rename from sudo.c
rename to plugins/sudoers/sudoers.c
diff --git a/sudo.h b/plugins/sudoers/sudoers.h
similarity index 100%
rename from sudo.h
rename to plugins/sudoers/sudoers.h
diff --git a/sudoers2ldif b/plugins/sudoers/sudoers2ldif
similarity index 100%
rename from sudoers2ldif
rename to plugins/sudoers/sudoers2ldif
diff --git a/sudoreplay.c b/plugins/sudoers/sudoreplay.c
similarity index 100%
rename from sudoreplay.c
rename to plugins/sudoers/sudoreplay.c
diff --git a/testsudoers.c b/plugins/sudoers/testsudoers.c
similarity index 100%
rename from testsudoers.c
rename to plugins/sudoers/testsudoers.c
diff --git a/timestr.c b/plugins/sudoers/timestr.c
similarity index 100%
rename from timestr.c
rename to plugins/sudoers/timestr.c
diff --git a/toke.c b/plugins/sudoers/toke.c
similarity index 100%
rename from toke.c
rename to plugins/sudoers/toke.c
diff --git a/toke.l b/plugins/sudoers/toke.l
similarity index 100%
rename from toke.l
rename to plugins/sudoers/toke.l
diff --git a/tsgetgrpw.c b/plugins/sudoers/tsgetgrpw.c
similarity index 100%
rename from tsgetgrpw.c
rename to plugins/sudoers/tsgetgrpw.c
diff --git a/vasgroups.c b/plugins/sudoers/vasgroups.c
similarity index 100%
rename from vasgroups.c
rename to plugins/sudoers/vasgroups.c
diff --git a/visudo.c b/plugins/sudoers/visudo.c
similarity index 100%
rename from visudo.c
rename to plugins/sudoers/visudo.c
diff --git a/aix.c b/src/aix.c
similarity index 100%
rename from aix.c
rename to src/aix.c
diff --git a/alloc.c b/src/alloc.c
similarity index 100%
rename from alloc.c
rename to src/alloc.c
diff --git a/audit.c b/src/audit.c
similarity index 100%
rename from audit.c
rename to src/audit.c
diff --git a/bsm_audit.c b/src/bsm_audit.c
similarity index 100%
rename from bsm_audit.c
rename to src/bsm_audit.c
diff --git a/bsm_audit.h b/src/bsm_audit.h
similarity index 100%
rename from bsm_audit.h
rename to src/bsm_audit.h
diff --git a/error.c b/src/error.c
similarity index 100%
rename from error.c
rename to src/error.c
diff --git a/fileops.c b/src/fileops.c
similarity index 100%
rename from fileops.c
rename to src/fileops.c
diff --git a/lbuf.c b/src/lbuf.c
similarity index 100%
rename from lbuf.c
rename to src/lbuf.c
diff --git a/list.c b/src/list.c
similarity index 100%
rename from list.c
rename to src/list.c
diff --git a/pty.c b/src/pty.c
similarity index 100%
rename from pty.c
rename to src/pty.c
diff --git a/script.c b/src/script.c
similarity index 100%
rename from script.c
rename to src/script.c
diff --git a/selinux.c b/src/selinux.c
similarity index 100%
rename from selinux.c
rename to src/selinux.c
diff --git a/sesh.c b/src/sesh.c
similarity index 100%
rename from sesh.c
rename to src/sesh.c
diff --git a/sudo_edit.c b/src/sudo_edit.c
similarity index 100%
rename from sudo_edit.c
rename to src/sudo_edit.c
diff --git a/sudo_noexec.c b/src/sudo_noexec.c
similarity index 100%
rename from sudo_noexec.c
rename to src/sudo_noexec.c
diff --git a/term.c b/src/term.c
similarity index 100%
rename from term.c
rename to src/term.c
diff --git a/tgetpass.c b/src/tgetpass.c
similarity index 100%
rename from tgetpass.c
rename to src/tgetpass.c
diff --git a/zero_bytes.c b/src/zero_bytes.c
similarity index 100%
rename from zero_bytes.c
rename to src/zero_bytes.c