diff --git a/examples/ansible.cfg b/examples/ansible.cfg
index 4ab8cca1726..a1faa6fa66a 100644
--- a/examples/ansible.cfg
+++ b/examples/ansible.cfg
@@ -125,12 +125,13 @@ ansible_managed = Ansible managed: {file} on {host}
 
 
 # set plugin path directories here, separate with colons
-action_plugins     = /usr/share/ansible_plugins/action_plugins
-callback_plugins   = /usr/share/ansible_plugins/callback_plugins
-connection_plugins = /usr/share/ansible_plugins/connection_plugins
-lookup_plugins     = /usr/share/ansible_plugins/lookup_plugins
-vars_plugins       = /usr/share/ansible_plugins/vars_plugins
-filter_plugins     = /usr/share/ansible_plugins/filter_plugins
+#action_plugins     = /usr/share/ansible/plugins/action
+#callback_plugins   = /usr/share/ansible/plugins/callback
+#connection_plugins = /usr/share/ansible/plugins/connection
+#lookup_plugins     = /usr/share/ansible/plugins/lookup
+#vars_plugins       = /usr/share/ansible/plugins/vars
+#filter_plugins     = /usr/share/ansible/plugins/filter
+#test_plugins       = /usr/share/ansible/plugins/test
 
 # by default callbacks are not loaded for /bin/ansible, enable this if you
 # want, for example, a notification or logging callback to also apply to 
diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py
index e23e99f551f..e7fec130e23 100644
--- a/lib/ansible/constants.py
+++ b/lib/ansible/constants.py
@@ -184,14 +184,15 @@ DEFAULT_BECOME_ASK_PASS   = get_config(p, 'privilege_escalation', 'become_ask_pa
 # PLUGINS
 DEFAULT_SQUASH_ACTIONS         = get_config(p, DEFAULTS, 'squash_actions',     'ANSIBLE_SQUASH_ACTIONS', "apt, yum, pkgng, zypper, dnf", islist=True)
 # paths
-DEFAULT_ACTION_PLUGIN_PATH     = get_config(p, DEFAULTS, 'action_plugins',     'ANSIBLE_ACTION_PLUGINS', '~/.ansible/plugins/action_plugins:/usr/share/ansible_plugins/action_plugins', ispath=True)
-DEFAULT_CACHE_PLUGIN_PATH      = get_config(p, DEFAULTS, 'cache_plugins',      'ANSIBLE_CACHE_PLUGINS', '~/.ansible/plugins/cache_plugins:/usr/share/ansible_plugins/cache_plugins', ispath=True)
-DEFAULT_CALLBACK_PLUGIN_PATH   = get_config(p, DEFAULTS, 'callback_plugins',   'ANSIBLE_CALLBACK_PLUGINS', '~/.ansible/plugins/callback_plugins:/usr/share/ansible_plugins/callback_plugins', ispath=True)
-DEFAULT_CONNECTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'connection_plugins', 'ANSIBLE_CONNECTION_PLUGINS', '~/.ansible/plugins/connection_plugins:/usr/share/ansible_plugins/connection_plugins', ispath=True)
-DEFAULT_LOOKUP_PLUGIN_PATH     = get_config(p, DEFAULTS, 'lookup_plugins',     'ANSIBLE_LOOKUP_PLUGINS', '~/.ansible/plugins/lookup_plugins:/usr/share/ansible_plugins/lookup_plugins', ispath=True)
-DEFAULT_VARS_PLUGIN_PATH       = get_config(p, DEFAULTS, 'vars_plugins',       'ANSIBLE_VARS_PLUGINS', '~/.ansible/plugins/vars_plugins:/usr/share/ansible_plugins/vars_plugins', ispath=True)
-DEFAULT_FILTER_PLUGIN_PATH     = get_config(p, DEFAULTS, 'filter_plugins',     'ANSIBLE_FILTER_PLUGINS', '~/.ansible/plugins/filter_plugins:/usr/share/ansible_plugins/filter_plugins', ispath=True)
-DEFAULT_TEST_PLUGIN_PATH       = get_config(p, DEFAULTS, 'test_plugins',       'ANSIBLE_TEST_PLUGINS', '~/.ansible/plugins/test_plugins:/usr/share/ansible_plugins/test_plugins', ispath=True)
+DEFAULT_ACTION_PLUGIN_PATH     = get_config(p, DEFAULTS, 'action_plugins',     'ANSIBLE_ACTION_PLUGINS', '~/.ansible/plugins/action:/usr/share/ansible/plugins/action', ispath=True)
+DEFAULT_CACHE_PLUGIN_PATH      = get_config(p, DEFAULTS, 'cache_plugins',      'ANSIBLE_CACHE_PLUGINS', '~/.ansible/plugins/cache:/usr/share/ansible/plugins/cache', ispath=True)
+DEFAULT_CALLBACK_PLUGIN_PATH   = get_config(p, DEFAULTS, 'callback_plugins',   'ANSIBLE_CALLBACK_PLUGINS', '~/.ansible/plugins/callback:/usr/share/ansible/plugins/callback', ispath=True)
+DEFAULT_CONNECTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'connection_plugins', 'ANSIBLE_CONNECTION_PLUGINS', '~/.ansible/plugins/connection:/usr/share/ansible/plugins/connection', ispath=True)
+DEFAULT_LOOKUP_PLUGIN_PATH     = get_config(p, DEFAULTS, 'lookup_plugins',     'ANSIBLE_LOOKUP_PLUGINS', '~/.ansible/plugins/lookup:/usr/share/ansible/plugins/lookup', ispath=True)
+DEFAULT_INVENTORy_PLUGIN_PATH  = get_config(p, DEFAULTS, 'inventory_plugins',  'ANSIBLE_INVENTORY_PLUGINS', '~/.ansible/plugins/inventory:/usr/share/ansible/plugins/inventory', ispath=True)
+DEFAULT_VARS_PLUGIN_PATH       = get_config(p, DEFAULTS, 'vars_plugins',       'ANSIBLE_VARS_PLUGINS', '~/.ansible/plugins/vars:/usr/share/ansible/plugins/vars', ispath=True)
+DEFAULT_FILTER_PLUGIN_PATH     = get_config(p, DEFAULTS, 'filter_plugins',     'ANSIBLE_FILTER_PLUGINS', '~/.ansible/plugins/filter:/usr/share/ansible/plugins/filter', ispath=True)
+DEFAULT_TEST_PLUGIN_PATH       = get_config(p, DEFAULTS, 'test_plugins',       'ANSIBLE_TEST_PLUGINS', '~/.ansible/plugins/test:/usr/share/ansible/plugins/test', ispath=True)
 DEFAULT_STDOUT_CALLBACK        = get_config(p, DEFAULTS, 'stdout_callback',    'ANSIBLE_STDOUT_CALLBACK', 'default')
 # cache
 CACHE_PLUGIN                   = get_config(p, DEFAULTS, 'fact_caching', 'ANSIBLE_CACHE_PLUGIN', 'memory')
diff --git a/lib/ansible/plugins/__init__.py b/lib/ansible/plugins/__init__.py
index cdf1d975305..06f22611384 100644
--- a/lib/ansible/plugins/__init__.py
+++ b/lib/ansible/plugins/__init__.py
@@ -317,7 +317,7 @@ callback_loader = PluginLoader(
 
 connection_loader = PluginLoader(
     'Connection',
-    'ansible.plugins.connections',
+    'ansible.plugins.connection',
     C.DEFAULT_CONNECTION_PLUGIN_PATH,
     'connection_plugins',
     aliases={'paramiko': 'paramiko_ssh'},
@@ -376,7 +376,7 @@ fragment_loader = PluginLoader(
 
 strategy_loader = PluginLoader(
     'StrategyModule',
-    'ansible.plugins.strategies',
+    'ansible.plugins.strategy',
     None,
     'strategy_plugins',
     required_base_class='StrategyBase',
diff --git a/lib/ansible/plugins/connections/__init__.py b/lib/ansible/plugins/connection/__init__.py
similarity index 100%
rename from lib/ansible/plugins/connections/__init__.py
rename to lib/ansible/plugins/connection/__init__.py
diff --git a/lib/ansible/plugins/connections/accelerate.py b/lib/ansible/plugins/connection/accelerate.py
similarity index 100%
rename from lib/ansible/plugins/connections/accelerate.py
rename to lib/ansible/plugins/connection/accelerate.py
diff --git a/lib/ansible/plugins/connections/chroot.py b/lib/ansible/plugins/connection/chroot.py
similarity index 100%
rename from lib/ansible/plugins/connections/chroot.py
rename to lib/ansible/plugins/connection/chroot.py
diff --git a/lib/ansible/plugins/connections/docker.py b/lib/ansible/plugins/connection/docker.py
similarity index 100%
rename from lib/ansible/plugins/connections/docker.py
rename to lib/ansible/plugins/connection/docker.py
diff --git a/lib/ansible/plugins/connections/funcd.py b/lib/ansible/plugins/connection/funcd.py
similarity index 100%
rename from lib/ansible/plugins/connections/funcd.py
rename to lib/ansible/plugins/connection/funcd.py
diff --git a/lib/ansible/plugins/connections/jail.py b/lib/ansible/plugins/connection/jail.py
similarity index 100%
rename from lib/ansible/plugins/connections/jail.py
rename to lib/ansible/plugins/connection/jail.py
diff --git a/lib/ansible/plugins/connections/libvirt_lxc.py b/lib/ansible/plugins/connection/libvirt_lxc.py
similarity index 100%
rename from lib/ansible/plugins/connections/libvirt_lxc.py
rename to lib/ansible/plugins/connection/libvirt_lxc.py
diff --git a/lib/ansible/plugins/connections/local.py b/lib/ansible/plugins/connection/local.py
similarity index 100%
rename from lib/ansible/plugins/connections/local.py
rename to lib/ansible/plugins/connection/local.py
diff --git a/lib/ansible/plugins/connections/paramiko_ssh.py b/lib/ansible/plugins/connection/paramiko_ssh.py
similarity index 100%
rename from lib/ansible/plugins/connections/paramiko_ssh.py
rename to lib/ansible/plugins/connection/paramiko_ssh.py
diff --git a/lib/ansible/plugins/connections/ssh.py b/lib/ansible/plugins/connection/ssh.py
similarity index 100%
rename from lib/ansible/plugins/connections/ssh.py
rename to lib/ansible/plugins/connection/ssh.py
diff --git a/lib/ansible/plugins/connections/winrm.py b/lib/ansible/plugins/connection/winrm.py
similarity index 100%
rename from lib/ansible/plugins/connections/winrm.py
rename to lib/ansible/plugins/connection/winrm.py
diff --git a/lib/ansible/plugins/connections/zone.py b/lib/ansible/plugins/connection/zone.py
similarity index 100%
rename from lib/ansible/plugins/connections/zone.py
rename to lib/ansible/plugins/connection/zone.py
diff --git a/lib/ansible/plugins/strategies/__init__.py b/lib/ansible/plugins/strategy/__init__.py
similarity index 100%
rename from lib/ansible/plugins/strategies/__init__.py
rename to lib/ansible/plugins/strategy/__init__.py
diff --git a/lib/ansible/plugins/strategies/free.py b/lib/ansible/plugins/strategy/free.py
similarity index 100%
rename from lib/ansible/plugins/strategies/free.py
rename to lib/ansible/plugins/strategy/free.py
diff --git a/lib/ansible/plugins/strategies/linear.py b/lib/ansible/plugins/strategy/linear.py
similarity index 100%
rename from lib/ansible/plugins/strategies/linear.py
rename to lib/ansible/plugins/strategy/linear.py