diff --git a/cloudformation b/cloud/cloudformation
similarity index 100%
rename from cloudformation
rename to cloud/cloudformation
diff --git a/ec2 b/cloud/ec2
similarity index 100%
rename from ec2
rename to cloud/ec2
diff --git a/ec2_facts b/cloud/ec2_facts
similarity index 100%
rename from ec2_facts
rename to cloud/ec2_facts
diff --git a/ec2_vol b/cloud/ec2_vol
similarity index 100%
rename from ec2_vol
rename to cloud/ec2_vol
diff --git a/rax b/cloud/rax
similarity index 100%
rename from rax
rename to cloud/rax
diff --git a/s3 b/cloud/s3
similarity index 100%
rename from s3
rename to cloud/s3
diff --git a/virt b/cloud/virt
similarity index 100%
rename from virt
rename to cloud/virt
diff --git a/command b/commands/command
similarity index 100%
rename from command
rename to commands/command
diff --git a/raw b/commands/raw
similarity index 100%
rename from raw
rename to commands/raw
diff --git a/script b/commands/script
similarity index 100%
rename from script
rename to commands/script
diff --git a/shell b/commands/shell
similarity index 100%
rename from shell
rename to commands/shell
diff --git a/mongodb_user b/database/mongodb_user
similarity index 100%
rename from mongodb_user
rename to database/mongodb_user
diff --git a/mysql_db b/database/mysql_db
similarity index 100%
rename from mysql_db
rename to database/mysql_db
diff --git a/mysql_user b/database/mysql_user
similarity index 100%
rename from mysql_user
rename to database/mysql_user
diff --git a/postgresql_db b/database/postgresql_db
similarity index 100%
rename from postgresql_db
rename to database/postgresql_db
diff --git a/postgresql_privs b/database/postgresql_privs
similarity index 100%
rename from postgresql_privs
rename to database/postgresql_privs
diff --git a/postgresql_user b/database/postgresql_user
similarity index 100%
rename from postgresql_user
rename to database/postgresql_user
diff --git a/riak b/database/riak
similarity index 100%
rename from riak
rename to database/riak
diff --git a/assemble b/files/assemble
similarity index 100%
rename from assemble
rename to files/assemble
diff --git a/copy b/files/copy
similarity index 100%
rename from copy
rename to files/copy
diff --git a/file b/files/file
similarity index 100%
rename from file
rename to files/file
diff --git a/ini_file b/files/ini_file
similarity index 100%
rename from ini_file
rename to files/ini_file
diff --git a/lineinfile b/files/lineinfile
similarity index 100%
rename from lineinfile
rename to files/lineinfile
diff --git a/template b/files/template
similarity index 100%
rename from template
rename to files/template
diff --git a/async_status b/internal/async_status
similarity index 100%
rename from async_status
rename to internal/async_status
diff --git a/async_wrapper b/internal/async_wrapper
similarity index 100%
rename from async_wrapper
rename to internal/async_wrapper
diff --git a/add_host b/inventory/add_host
similarity index 100%
rename from add_host
rename to inventory/add_host
diff --git a/group_by b/inventory/group_by
similarity index 100%
rename from group_by
rename to inventory/group_by
diff --git a/rabbitmq_parameter b/messaging/rabbitmq_parameter
similarity index 100%
rename from rabbitmq_parameter
rename to messaging/rabbitmq_parameter
diff --git a/rabbitmq_plugin b/messaging/rabbitmq_plugin
similarity index 100%
rename from rabbitmq_plugin
rename to messaging/rabbitmq_plugin
diff --git a/rabbitmq_user b/messaging/rabbitmq_user
similarity index 100%
rename from rabbitmq_user
rename to messaging/rabbitmq_user
diff --git a/rabbitmq_vhost b/messaging/rabbitmq_vhost
similarity index 100%
rename from rabbitmq_vhost
rename to messaging/rabbitmq_vhost
diff --git a/nagios b/monitoring/nagios
similarity index 100%
rename from nagios
rename to monitoring/nagios
diff --git a/netscaler b/net_infrastructure/netscaler
similarity index 100%
rename from netscaler
rename to net_infrastructure/netscaler
diff --git a/fetch b/network/fetch
similarity index 100%
rename from fetch
rename to network/fetch
diff --git a/get_url b/network/get_url
similarity index 100%
rename from get_url
rename to network/get_url
diff --git a/slurp b/network/slurp
similarity index 100%
rename from slurp
rename to network/slurp
diff --git a/uri b/network/uri
similarity index 100%
rename from uri
rename to network/uri
diff --git a/apt b/packaging/apt
similarity index 100%
rename from apt
rename to packaging/apt
diff --git a/apt_key b/packaging/apt_key
similarity index 100%
rename from apt_key
rename to packaging/apt_key
diff --git a/apt_repository b/packaging/apt_repository
similarity index 100%
rename from apt_repository
rename to packaging/apt_repository
diff --git a/easy_install b/packaging/easy_install
similarity index 100%
rename from easy_install
rename to packaging/easy_install
diff --git a/gem b/packaging/gem
old mode 100755
new mode 100644
similarity index 100%
rename from gem
rename to packaging/gem
diff --git a/homebrew b/packaging/homebrew
old mode 100755
new mode 100644
similarity index 100%
rename from homebrew
rename to packaging/homebrew
diff --git a/macports b/packaging/macports
similarity index 100%
rename from macports
rename to packaging/macports
diff --git a/npm b/packaging/npm
similarity index 100%
rename from npm
rename to packaging/npm
diff --git a/openbsd_pkg b/packaging/openbsd_pkg
similarity index 100%
rename from openbsd_pkg
rename to packaging/openbsd_pkg
diff --git a/opkg b/packaging/opkg
similarity index 100%
rename from opkg
rename to packaging/opkg
diff --git a/pacman b/packaging/pacman
old mode 100755
new mode 100644
similarity index 100%
rename from pacman
rename to packaging/pacman
diff --git a/pip b/packaging/pip
similarity index 100%
rename from pip
rename to packaging/pip
diff --git a/pkgin b/packaging/pkgin
similarity index 100%
rename from pkgin
rename to packaging/pkgin
diff --git a/rhn_channel b/packaging/rhn_channel
old mode 100755
new mode 100644
similarity index 100%
rename from rhn_channel
rename to packaging/rhn_channel
diff --git a/svr4pkg b/packaging/svr4pkg
similarity index 100%
rename from svr4pkg
rename to packaging/svr4pkg
diff --git a/yum b/packaging/yum
similarity index 100%
rename from yum
rename to packaging/yum
diff --git a/bzr b/source_control/bzr
similarity index 100%
rename from bzr
rename to source_control/bzr
diff --git a/git b/source_control/git
similarity index 100%
rename from git
rename to source_control/git
diff --git a/hg b/source_control/hg
similarity index 100%
rename from hg
rename to source_control/hg
diff --git a/subversion b/source_control/subversion
similarity index 100%
rename from subversion
rename to source_control/subversion
diff --git a/authorized_key b/system/authorized_key
similarity index 100%
rename from authorized_key
rename to system/authorized_key
diff --git a/cron b/system/cron
similarity index 100%
rename from cron
rename to system/cron
diff --git a/facter b/system/facter
similarity index 100%
rename from facter
rename to system/facter
diff --git a/group b/system/group
similarity index 100%
rename from group
rename to system/group
diff --git a/lvg b/system/lvg
old mode 100755
new mode 100644
similarity index 100%
rename from lvg
rename to system/lvg
diff --git a/lvol b/system/lvol
similarity index 100%
rename from lvol
rename to system/lvol
diff --git a/mount b/system/mount
similarity index 100%
rename from mount
rename to system/mount
diff --git a/ohai b/system/ohai
similarity index 100%
rename from ohai
rename to system/ohai
diff --git a/ping b/system/ping
similarity index 100%
rename from ping
rename to system/ping
diff --git a/seboolean b/system/seboolean
similarity index 100%
rename from seboolean
rename to system/seboolean
diff --git a/selinux b/system/selinux
similarity index 100%
rename from selinux
rename to system/selinux
diff --git a/service b/system/service
similarity index 100%
rename from service
rename to system/service
diff --git a/setup b/system/setup
similarity index 100%
rename from setup
rename to system/setup
diff --git a/sysctl b/system/sysctl
similarity index 100%
rename from sysctl
rename to system/sysctl
diff --git a/user b/system/user
similarity index 100%
rename from user
rename to system/user
diff --git a/zfs b/system/zfs
similarity index 100%
rename from zfs
rename to system/zfs
diff --git a/debug b/utilities/debug
similarity index 100%
rename from debug
rename to utilities/debug
diff --git a/fail b/utilities/fail
similarity index 100%
rename from fail
rename to utilities/fail
diff --git a/fireball b/utilities/fireball
similarity index 100%
rename from fireball
rename to utilities/fireball
diff --git a/mail b/utilities/mail
similarity index 100%
rename from mail
rename to utilities/mail
diff --git a/pause b/utilities/pause
similarity index 100%
rename from pause
rename to utilities/pause
diff --git a/set_fact b/utilities/set_fact
similarity index 100%
rename from set_fact
rename to utilities/set_fact
diff --git a/wait_for b/utilities/wait_for
similarity index 100%
rename from wait_for
rename to utilities/wait_for
diff --git a/django_manage b/web_infrastructure/django_manage
similarity index 100%
rename from django_manage
rename to web_infrastructure/django_manage
diff --git a/supervisorctl b/web_infrastructure/supervisorctl
similarity index 100%
rename from supervisorctl
rename to web_infrastructure/supervisorctl