Move plugin directories

lib/ansible/callbacks.py

@@ -24,7 +24,7 @@ import os.path
 from ansible.color import stringc
 
 dirname = os.path.dirname(__file__)
-callbacks = utils.import_plugins(os.path.join(dirname, 'callbacks'))
+callbacks = utils.import_plugins(os.path.join(dirname, 'callback_plugins'))
 callbacks = [ c.CallbackModule() for c in callbacks.values() ]
 
 cowsay = None

lib/ansible/runner/connection.py

@@ -23,7 +23,7 @@ from ansible.errors import AnsibleError
 
 import os.path
 dirname = os.path.dirname(__file__)
-modules = utils.import_plugins(os.path.join(dirname, 'connections'))
+modules = utils.import_plugins(os.path.join(dirname, 'connection_plugins'))
 
 # rename this module
 modules['paramiko'] = modules['paramiko_ssh']