diff --git a/extras/cloud/ovirt b/cloud/ovirt
similarity index 100%
rename from extras/cloud/ovirt
rename to cloud/ovirt
diff --git a/extras/cloud/virt b/cloud/virt
similarity index 100%
rename from extras/cloud/virt
rename to cloud/virt
diff --git a/extras/database/mongodb_user b/database/mongodb_user
similarity index 100%
rename from extras/database/mongodb_user
rename to database/mongodb_user
diff --git a/extras/database/mysql_replication b/database/mysql_replication
similarity index 100%
rename from extras/database/mysql_replication
rename to database/mysql_replication
diff --git a/extras/database/redis b/database/redis
similarity index 100%
rename from extras/database/redis
rename to database/redis
diff --git a/extras/database/riak b/database/riak
similarity index 100%
rename from extras/database/riak
rename to database/riak
diff --git a/extras/messaging/rabbitmq_parameter b/messaging/rabbitmq_parameter
similarity index 100%
rename from extras/messaging/rabbitmq_parameter
rename to messaging/rabbitmq_parameter
diff --git a/extras/messaging/rabbitmq_plugin b/messaging/rabbitmq_plugin
similarity index 100%
rename from extras/messaging/rabbitmq_plugin
rename to messaging/rabbitmq_plugin
diff --git a/extras/messaging/rabbitmq_policy b/messaging/rabbitmq_policy
similarity index 100%
rename from extras/messaging/rabbitmq_policy
rename to messaging/rabbitmq_policy
diff --git a/extras/messaging/rabbitmq_user b/messaging/rabbitmq_user
similarity index 100%
rename from extras/messaging/rabbitmq_user
rename to messaging/rabbitmq_user
diff --git a/extras/messaging/rabbitmq_vhost b/messaging/rabbitmq_vhost
similarity index 100%
rename from extras/messaging/rabbitmq_vhost
rename to messaging/rabbitmq_vhost
diff --git a/extras/monitoring/airbrake_deployment b/monitoring/airbrake_deployment
similarity index 100%
rename from extras/monitoring/airbrake_deployment
rename to monitoring/airbrake_deployment
diff --git a/extras/monitoring/bigpanda b/monitoring/bigpanda
similarity index 100%
rename from extras/monitoring/bigpanda
rename to monitoring/bigpanda
diff --git a/extras/monitoring/boundary_meter b/monitoring/boundary_meter
similarity index 100%
rename from extras/monitoring/boundary_meter
rename to monitoring/boundary_meter
diff --git a/extras/monitoring/datadog_event b/monitoring/datadog_event
similarity index 100%
rename from extras/monitoring/datadog_event
rename to monitoring/datadog_event
diff --git a/extras/monitoring/librato_annotation b/monitoring/librato_annotation
similarity index 100%
rename from extras/monitoring/librato_annotation
rename to monitoring/librato_annotation
diff --git a/extras/monitoring/logentries b/monitoring/logentries
similarity index 100%
rename from extras/monitoring/logentries
rename to monitoring/logentries
diff --git a/extras/monitoring/monit b/monitoring/monit
similarity index 100%
rename from extras/monitoring/monit
rename to monitoring/monit
diff --git a/extras/monitoring/nagios b/monitoring/nagios
similarity index 100%
rename from extras/monitoring/nagios
rename to monitoring/nagios
diff --git a/extras/monitoring/newrelic_deployment b/monitoring/newrelic_deployment
similarity index 100%
rename from extras/monitoring/newrelic_deployment
rename to monitoring/newrelic_deployment
diff --git a/extras/monitoring/pagerduty b/monitoring/pagerduty
similarity index 100%
rename from extras/monitoring/pagerduty
rename to monitoring/pagerduty
diff --git a/extras/monitoring/pingdom b/monitoring/pingdom
similarity index 100%
rename from extras/monitoring/pingdom
rename to monitoring/pingdom
diff --git a/extras/monitoring/rollbar_deployment b/monitoring/rollbar_deployment
similarity index 100%
rename from extras/monitoring/rollbar_deployment
rename to monitoring/rollbar_deployment
diff --git a/extras/monitoring/stackdriver b/monitoring/stackdriver
similarity index 100%
rename from extras/monitoring/stackdriver
rename to monitoring/stackdriver
diff --git a/extras/monitoring/zabbix_maintenance b/monitoring/zabbix_maintenance
similarity index 100%
rename from extras/monitoring/zabbix_maintenance
rename to monitoring/zabbix_maintenance
diff --git a/extras/net_infrastructure/a10_server b/net_infrastructure/a10_server
similarity index 100%
rename from extras/net_infrastructure/a10_server
rename to net_infrastructure/a10_server
diff --git a/extras/net_infrastructure/a10_service_group b/net_infrastructure/a10_service_group
similarity index 100%
rename from extras/net_infrastructure/a10_service_group
rename to net_infrastructure/a10_service_group
diff --git a/extras/net_infrastructure/a10_virtual_server b/net_infrastructure/a10_virtual_server
similarity index 100%
rename from extras/net_infrastructure/a10_virtual_server
rename to net_infrastructure/a10_virtual_server
diff --git a/extras/net_infrastructure/bigip_facts b/net_infrastructure/bigip_facts
similarity index 100%
rename from extras/net_infrastructure/bigip_facts
rename to net_infrastructure/bigip_facts
diff --git a/extras/net_infrastructure/bigip_monitor_http b/net_infrastructure/bigip_monitor_http
similarity index 100%
rename from extras/net_infrastructure/bigip_monitor_http
rename to net_infrastructure/bigip_monitor_http
diff --git a/extras/net_infrastructure/bigip_monitor_tcp b/net_infrastructure/bigip_monitor_tcp
similarity index 100%
rename from extras/net_infrastructure/bigip_monitor_tcp
rename to net_infrastructure/bigip_monitor_tcp
diff --git a/extras/net_infrastructure/bigip_node b/net_infrastructure/bigip_node
similarity index 100%
rename from extras/net_infrastructure/bigip_node
rename to net_infrastructure/bigip_node
diff --git a/extras/net_infrastructure/bigip_pool b/net_infrastructure/bigip_pool
similarity index 100%
rename from extras/net_infrastructure/bigip_pool
rename to net_infrastructure/bigip_pool
diff --git a/extras/net_infrastructure/bigip_pool_member b/net_infrastructure/bigip_pool_member
similarity index 100%
rename from extras/net_infrastructure/bigip_pool_member
rename to net_infrastructure/bigip_pool_member
diff --git a/extras/net_infrastructure/dnsimple b/net_infrastructure/dnsimple
similarity index 100%
rename from extras/net_infrastructure/dnsimple
rename to net_infrastructure/dnsimple
diff --git a/extras/net_infrastructure/dnsmadeeasy b/net_infrastructure/dnsmadeeasy
similarity index 100%
rename from extras/net_infrastructure/dnsmadeeasy
rename to net_infrastructure/dnsmadeeasy
diff --git a/extras/net_infrastructure/lldp b/net_infrastructure/lldp
similarity index 100%
rename from extras/net_infrastructure/lldp
rename to net_infrastructure/lldp
diff --git a/extras/net_infrastructure/netscaler b/net_infrastructure/netscaler
similarity index 100%
rename from extras/net_infrastructure/netscaler
rename to net_infrastructure/netscaler
diff --git a/extras/net_infrastructure/openvswitch_bridge b/net_infrastructure/openvswitch_bridge
similarity index 100%
rename from extras/net_infrastructure/openvswitch_bridge
rename to net_infrastructure/openvswitch_bridge
diff --git a/extras/net_infrastructure/openvswitch_port b/net_infrastructure/openvswitch_port
similarity index 100%
rename from extras/net_infrastructure/openvswitch_port
rename to net_infrastructure/openvswitch_port
diff --git a/extras/notification/campfire b/notification/campfire
similarity index 100%
rename from extras/notification/campfire
rename to notification/campfire
diff --git a/extras/notification/flowdock b/notification/flowdock
similarity index 100%
rename from extras/notification/flowdock
rename to notification/flowdock
diff --git a/extras/notification/grove b/notification/grove
similarity index 100%
rename from extras/notification/grove
rename to notification/grove
diff --git a/extras/notification/hipchat b/notification/hipchat
similarity index 100%
rename from extras/notification/hipchat
rename to notification/hipchat
diff --git a/extras/notification/irc b/notification/irc
similarity index 100%
rename from extras/notification/irc
rename to notification/irc
diff --git a/extras/notification/jabber b/notification/jabber
similarity index 100%
rename from extras/notification/jabber
rename to notification/jabber
diff --git a/extras/notification/mail b/notification/mail
similarity index 100%
rename from extras/notification/mail
rename to notification/mail
diff --git a/extras/notification/mqtt b/notification/mqtt
similarity index 100%
rename from extras/notification/mqtt
rename to notification/mqtt
diff --git a/extras/notification/nexmo b/notification/nexmo
similarity index 100%
rename from extras/notification/nexmo
rename to notification/nexmo
diff --git a/extras/notification/osx_say b/notification/osx_say
similarity index 100%
rename from extras/notification/osx_say
rename to notification/osx_say
diff --git a/extras/notification/slack b/notification/slack
similarity index 100%
rename from extras/notification/slack
rename to notification/slack
diff --git a/extras/notification/sns b/notification/sns
similarity index 100%
rename from extras/notification/sns
rename to notification/sns
diff --git a/extras/notification/twilio b/notification/twilio
similarity index 100%
rename from extras/notification/twilio
rename to notification/twilio
diff --git a/extras/notification/typetalk b/notification/typetalk
similarity index 100%
rename from extras/notification/typetalk
rename to notification/typetalk
diff --git a/extras/packaging/composer b/packaging/composer
similarity index 100%
rename from extras/packaging/composer
rename to packaging/composer
diff --git a/extras/packaging/cpanm b/packaging/cpanm
similarity index 100%
rename from extras/packaging/cpanm
rename to packaging/cpanm
diff --git a/extras/packaging/homebrew b/packaging/homebrew
similarity index 100%
rename from extras/packaging/homebrew
rename to packaging/homebrew
diff --git a/extras/packaging/homebrew_cask b/packaging/homebrew_cask
similarity index 100%
rename from extras/packaging/homebrew_cask
rename to packaging/homebrew_cask
diff --git a/extras/packaging/homebrew_tap b/packaging/homebrew_tap
similarity index 100%
rename from extras/packaging/homebrew_tap
rename to packaging/homebrew_tap
diff --git a/extras/packaging/layman b/packaging/layman
similarity index 100%
rename from extras/packaging/layman
rename to packaging/layman
diff --git a/extras/packaging/macports b/packaging/macports
similarity index 100%
rename from extras/packaging/macports
rename to packaging/macports
diff --git a/extras/packaging/npm b/packaging/npm
similarity index 100%
rename from extras/packaging/npm
rename to packaging/npm
diff --git a/extras/packaging/openbsd_pkg b/packaging/openbsd_pkg
similarity index 100%
rename from extras/packaging/openbsd_pkg
rename to packaging/openbsd_pkg
diff --git a/extras/packaging/opkg b/packaging/opkg
similarity index 100%
rename from extras/packaging/opkg
rename to packaging/opkg
diff --git a/extras/packaging/pacman b/packaging/pacman
similarity index 100%
rename from extras/packaging/pacman
rename to packaging/pacman
diff --git a/extras/packaging/pkgin b/packaging/pkgin
similarity index 100%
rename from extras/packaging/pkgin
rename to packaging/pkgin
diff --git a/extras/packaging/pkgng b/packaging/pkgng
similarity index 100%
rename from extras/packaging/pkgng
rename to packaging/pkgng
diff --git a/extras/packaging/pkgutil b/packaging/pkgutil
similarity index 100%
rename from extras/packaging/pkgutil
rename to packaging/pkgutil
diff --git a/extras/packaging/portage b/packaging/portage
similarity index 100%
rename from extras/packaging/portage
rename to packaging/portage
diff --git a/extras/packaging/portinstall b/packaging/portinstall
similarity index 100%
rename from extras/packaging/portinstall
rename to packaging/portinstall
diff --git a/extras/packaging/svr4pkg b/packaging/svr4pkg
similarity index 100%
rename from extras/packaging/svr4pkg
rename to packaging/svr4pkg
diff --git a/extras/packaging/swdepot b/packaging/swdepot
similarity index 100%
rename from extras/packaging/swdepot
rename to packaging/swdepot
diff --git a/extras/packaging/urpmi b/packaging/urpmi
similarity index 100%
rename from extras/packaging/urpmi
rename to packaging/urpmi
diff --git a/extras/packaging/zypper b/packaging/zypper
similarity index 100%
rename from extras/packaging/zypper
rename to packaging/zypper
diff --git a/extras/packaging/zypper_repository b/packaging/zypper_repository
similarity index 100%
rename from extras/packaging/zypper_repository
rename to packaging/zypper_repository
diff --git a/extras/source_control/bzr b/source_control/bzr
similarity index 100%
rename from extras/source_control/bzr
rename to source_control/bzr
diff --git a/extras/source_control/github_hooks b/source_control/github_hooks
similarity index 100%
rename from extras/source_control/github_hooks
rename to source_control/github_hooks
diff --git a/extras/system/alternatives b/system/alternatives
similarity index 100%
rename from extras/system/alternatives
rename to system/alternatives
diff --git a/extras/system/at b/system/at
similarity index 100%
rename from extras/system/at
rename to system/at
diff --git a/extras/system/capabilities b/system/capabilities
similarity index 100%
rename from extras/system/capabilities
rename to system/capabilities
diff --git a/extras/system/debconf b/system/debconf
similarity index 100%
rename from extras/system/debconf
rename to system/debconf
diff --git a/extras/system/facter b/system/facter
similarity index 100%
rename from extras/system/facter
rename to system/facter
diff --git a/extras/system/filesystem b/system/filesystem
similarity index 100%
rename from extras/system/filesystem
rename to system/filesystem
diff --git a/extras/system/firewalld b/system/firewalld
similarity index 100%
rename from extras/system/firewalld
rename to system/firewalld
diff --git a/extras/system/getent b/system/getent
similarity index 100%
rename from extras/system/getent
rename to system/getent
diff --git a/extras/system/kernel_blacklist b/system/kernel_blacklist
similarity index 100%
rename from extras/system/kernel_blacklist
rename to system/kernel_blacklist
diff --git a/extras/system/locale_gen b/system/locale_gen
similarity index 100%
rename from extras/system/locale_gen
rename to system/locale_gen
diff --git a/extras/system/lvg b/system/lvg
similarity index 100%
rename from extras/system/lvg
rename to system/lvg
diff --git a/extras/system/lvol b/system/lvol
similarity index 100%
rename from extras/system/lvol
rename to system/lvol
diff --git a/extras/system/modprobe b/system/modprobe
similarity index 100%
rename from extras/system/modprobe
rename to system/modprobe
diff --git a/extras/system/ohai b/system/ohai
similarity index 100%
rename from extras/system/ohai
rename to system/ohai
diff --git a/extras/system/open_iscsi b/system/open_iscsi
similarity index 100%
rename from extras/system/open_iscsi
rename to system/open_iscsi
diff --git a/extras/system/ufw b/system/ufw
similarity index 100%
rename from extras/system/ufw
rename to system/ufw
diff --git a/extras/system/zfs b/system/zfs
similarity index 100%
rename from extras/system/zfs
rename to system/zfs
diff --git a/extras/web_infrastructure/ejabberd_user b/web_infrastructure/ejabberd_user
similarity index 100%
rename from extras/web_infrastructure/ejabberd_user
rename to web_infrastructure/ejabberd_user
diff --git a/extras/web_infrastructure/jboss b/web_infrastructure/jboss
similarity index 100%
rename from extras/web_infrastructure/jboss
rename to web_infrastructure/jboss
diff --git a/extras/web_infrastructure/jira b/web_infrastructure/jira
similarity index 100%
rename from extras/web_infrastructure/jira
rename to web_infrastructure/jira