diff --git a/lib/ansible/modules/extras/cloud/misc/__init__.py b/lib/ansible/modules/extras/cloud/misc/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/ansible/modules/extras/cloud/ovirt.py b/lib/ansible/modules/extras/cloud/misc/ovirt.py
similarity index 100%
rename from lib/ansible/modules/extras/cloud/ovirt.py
rename to lib/ansible/modules/extras/cloud/misc/ovirt.py
diff --git a/lib/ansible/modules/extras/cloud/virt.py b/lib/ansible/modules/extras/cloud/misc/virt.py
similarity index 100%
rename from lib/ansible/modules/extras/cloud/virt.py
rename to lib/ansible/modules/extras/cloud/misc/virt.py
diff --git a/lib/ansible/modules/extras/database/misc/__init__.py b/lib/ansible/modules/extras/database/misc/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/ansible/modules/extras/database/mongodb_user.py b/lib/ansible/modules/extras/database/misc/mongodb_user.py
similarity index 100%
rename from lib/ansible/modules/extras/database/mongodb_user.py
rename to lib/ansible/modules/extras/database/misc/mongodb_user.py
diff --git a/lib/ansible/modules/extras/database/redis.py b/lib/ansible/modules/extras/database/misc/redis.py
similarity index 100%
rename from lib/ansible/modules/extras/database/redis.py
rename to lib/ansible/modules/extras/database/misc/redis.py
diff --git a/lib/ansible/modules/extras/database/riak.py b/lib/ansible/modules/extras/database/misc/riak.py
similarity index 100%
rename from lib/ansible/modules/extras/database/riak.py
rename to lib/ansible/modules/extras/database/misc/riak.py
diff --git a/lib/ansible/modules/extras/database/mysql/__init__.py b/lib/ansible/modules/extras/database/mysql/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/ansible/modules/extras/database/mysql_replication.py b/lib/ansible/modules/extras/database/mysql/mysql_replication.py
similarity index 100%
rename from lib/ansible/modules/extras/database/mysql_replication.py
rename to lib/ansible/modules/extras/database/mysql/mysql_replication.py