diff --git a/openstack_dashboard/contrib/trove/api/__init__.py b/trove_dashboard/api/__init__.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/api/__init__.py
rename to trove_dashboard/api/__init__.py
diff --git a/openstack_dashboard/contrib/trove/api/trove.py b/trove_dashboard/api/trove.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/api/trove.py
rename to trove_dashboard/api/trove.py
diff --git a/openstack_dashboard/contrib/trove/content/database_backups/__init__.py b/trove_dashboard/content/database_backups/__init__.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_backups/__init__.py
rename to trove_dashboard/content/database_backups/__init__.py
diff --git a/openstack_dashboard/contrib/trove/content/database_backups/panel.py b/trove_dashboard/content/database_backups/panel.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_backups/panel.py
rename to trove_dashboard/content/database_backups/panel.py
diff --git a/openstack_dashboard/contrib/trove/content/database_backups/tables.py b/trove_dashboard/content/database_backups/tables.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_backups/tables.py
rename to trove_dashboard/content/database_backups/tables.py
diff --git a/openstack_dashboard/contrib/trove/content/database_backups/templates/database_backups/_backup_details_help.html b/trove_dashboard/content/database_backups/templates/database_backups/_backup_details_help.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_backups/templates/database_backups/_backup_details_help.html
rename to trove_dashboard/content/database_backups/templates/database_backups/_backup_details_help.html
diff --git a/openstack_dashboard/contrib/trove/content/database_backups/templates/database_backups/backup.html b/trove_dashboard/content/database_backups/templates/database_backups/backup.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_backups/templates/database_backups/backup.html
rename to trove_dashboard/content/database_backups/templates/database_backups/backup.html
diff --git a/openstack_dashboard/contrib/trove/content/database_backups/templates/database_backups/details.html b/trove_dashboard/content/database_backups/templates/database_backups/details.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_backups/templates/database_backups/details.html
rename to trove_dashboard/content/database_backups/templates/database_backups/details.html
diff --git a/openstack_dashboard/contrib/trove/content/database_backups/templates/database_backups/index.html b/trove_dashboard/content/database_backups/templates/database_backups/index.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_backups/templates/database_backups/index.html
rename to trove_dashboard/content/database_backups/templates/database_backups/index.html
diff --git a/openstack_dashboard/contrib/trove/content/database_backups/tests.py b/trove_dashboard/content/database_backups/tests.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_backups/tests.py
rename to trove_dashboard/content/database_backups/tests.py
diff --git a/openstack_dashboard/contrib/trove/content/database_backups/urls.py b/trove_dashboard/content/database_backups/urls.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_backups/urls.py
rename to trove_dashboard/content/database_backups/urls.py
diff --git a/openstack_dashboard/contrib/trove/content/database_backups/views.py b/trove_dashboard/content/database_backups/views.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_backups/views.py
rename to trove_dashboard/content/database_backups/views.py
diff --git a/openstack_dashboard/contrib/trove/content/database_backups/workflows/__init__.py b/trove_dashboard/content/database_backups/workflows/__init__.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_backups/workflows/__init__.py
rename to trove_dashboard/content/database_backups/workflows/__init__.py
diff --git a/openstack_dashboard/contrib/trove/content/database_backups/workflows/create_backup.py b/trove_dashboard/content/database_backups/workflows/create_backup.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_backups/workflows/create_backup.py
rename to trove_dashboard/content/database_backups/workflows/create_backup.py
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/__init__.py b/trove_dashboard/content/database_clusters/__init__.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/__init__.py
rename to trove_dashboard/content/database_clusters/__init__.py
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/forms.py b/trove_dashboard/content/database_clusters/forms.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/forms.py
rename to trove_dashboard/content/database_clusters/forms.py
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/panel.py b/trove_dashboard/content/database_clusters/panel.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/panel.py
rename to trove_dashboard/content/database_clusters/panel.py
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/tables.py b/trove_dashboard/content/database_clusters/tables.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/tables.py
rename to trove_dashboard/content/database_clusters/tables.py
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/tabs.py b/trove_dashboard/content/database_clusters/tabs.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/tabs.py
rename to trove_dashboard/content/database_clusters/tabs.py
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_add_shard.html b/trove_dashboard/content/database_clusters/templates/database_clusters/_add_shard.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_add_shard.html
rename to trove_dashboard/content/database_clusters/templates/database_clusters/_add_shard.html
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview.html b/trove_dashboard/content/database_clusters/templates/database_clusters/_detail_overview.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview.html
rename to trove_dashboard/content/database_clusters/templates/database_clusters/_detail_overview.html
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview_mongodb.html b/trove_dashboard/content/database_clusters/templates/database_clusters/_detail_overview_mongodb.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview_mongodb.html
rename to trove_dashboard/content/database_clusters/templates/database_clusters/_detail_overview_mongodb.html
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview_vertica.html b/trove_dashboard/content/database_clusters/templates/database_clusters/_detail_overview_vertica.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview_vertica.html
rename to trove_dashboard/content/database_clusters/templates/database_clusters/_detail_overview_vertica.html
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_launch.html b/trove_dashboard/content/database_clusters/templates/database_clusters/_launch.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_launch.html
rename to trove_dashboard/content/database_clusters/templates/database_clusters/_launch.html
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_reset_password.html b/trove_dashboard/content/database_clusters/templates/database_clusters/_reset_password.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_reset_password.html
rename to trove_dashboard/content/database_clusters/templates/database_clusters/_reset_password.html
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/add_shard.html b/trove_dashboard/content/database_clusters/templates/database_clusters/add_shard.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/add_shard.html
rename to trove_dashboard/content/database_clusters/templates/database_clusters/add_shard.html
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/index.html b/trove_dashboard/content/database_clusters/templates/database_clusters/index.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/index.html
rename to trove_dashboard/content/database_clusters/templates/database_clusters/index.html
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/launch.html b/trove_dashboard/content/database_clusters/templates/database_clusters/launch.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/launch.html
rename to trove_dashboard/content/database_clusters/templates/database_clusters/launch.html
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/reset_password.html b/trove_dashboard/content/database_clusters/templates/database_clusters/reset_password.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/reset_password.html
rename to trove_dashboard/content/database_clusters/templates/database_clusters/reset_password.html
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/tests.py b/trove_dashboard/content/database_clusters/tests.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/tests.py
rename to trove_dashboard/content/database_clusters/tests.py
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/urls.py b/trove_dashboard/content/database_clusters/urls.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/urls.py
rename to trove_dashboard/content/database_clusters/urls.py
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/views.py b/trove_dashboard/content/database_clusters/views.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/database_clusters/views.py
rename to trove_dashboard/content/database_clusters/views.py
diff --git a/openstack_dashboard/contrib/trove/content/databases/__init__.py b/trove_dashboard/content/databases/__init__.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/__init__.py
rename to trove_dashboard/content/databases/__init__.py
diff --git a/openstack_dashboard/contrib/trove/content/databases/db_capability.py b/trove_dashboard/content/databases/db_capability.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/db_capability.py
rename to trove_dashboard/content/databases/db_capability.py
diff --git a/openstack_dashboard/contrib/trove/content/databases/forms.py b/trove_dashboard/content/databases/forms.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/forms.py
rename to trove_dashboard/content/databases/forms.py
diff --git a/openstack_dashboard/contrib/trove/content/databases/panel.py b/trove_dashboard/content/databases/panel.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/panel.py
rename to trove_dashboard/content/databases/panel.py
diff --git a/openstack_dashboard/contrib/trove/content/databases/tables.py b/trove_dashboard/content/databases/tables.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/tables.py
rename to trove_dashboard/content/databases/tables.py
diff --git a/openstack_dashboard/contrib/trove/content/databases/tabs.py b/trove_dashboard/content/databases/tabs.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/tabs.py
rename to trove_dashboard/content/databases/tabs.py
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html b/trove_dashboard/content/databases/templates/databases/_detail_overview.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html
rename to trove_dashboard/content/databases/templates/databases/_detail_overview.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_cassandra.html b/trove_dashboard/content/databases/templates/databases/_detail_overview_cassandra.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_cassandra.html
rename to trove_dashboard/content/databases/templates/databases/_detail_overview_cassandra.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_couchbase.html b/trove_dashboard/content/databases/templates/databases/_detail_overview_couchbase.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_couchbase.html
rename to trove_dashboard/content/databases/templates/databases/_detail_overview_couchbase.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_mongodb.html b/trove_dashboard/content/databases/templates/databases/_detail_overview_mongodb.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_mongodb.html
rename to trove_dashboard/content/databases/templates/databases/_detail_overview_mongodb.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_mysql.html b/trove_dashboard/content/databases/templates/databases/_detail_overview_mysql.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_mysql.html
rename to trove_dashboard/content/databases/templates/databases/_detail_overview_mysql.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_redis.html b/trove_dashboard/content/databases/templates/databases/_detail_overview_redis.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_redis.html
rename to trove_dashboard/content/databases/templates/databases/_detail_overview_redis.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_launch_advanced_help.html b/trove_dashboard/content/databases/templates/databases/_launch_advanced_help.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/_launch_advanced_help.html
rename to trove_dashboard/content/databases/templates/databases/_launch_advanced_help.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_launch_details_help.html b/trove_dashboard/content/databases/templates/databases/_launch_details_help.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/_launch_details_help.html
rename to trove_dashboard/content/databases/templates/databases/_launch_details_help.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_launch_initialize_help.html b/trove_dashboard/content/databases/templates/databases/_launch_initialize_help.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/_launch_initialize_help.html
rename to trove_dashboard/content/databases/templates/databases/_launch_initialize_help.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_launch_network_help.html b/trove_dashboard/content/databases/templates/databases/_launch_network_help.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/_launch_network_help.html
rename to trove_dashboard/content/databases/templates/databases/_launch_network_help.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_launch_networks.html b/trove_dashboard/content/databases/templates/databases/_launch_networks.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/_launch_networks.html
rename to trove_dashboard/content/databases/templates/databases/_launch_networks.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_instance.html b/trove_dashboard/content/databases/templates/databases/_resize_instance.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_instance.html
rename to trove_dashboard/content/databases/templates/databases/_resize_instance.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_volume.html b/trove_dashboard/content/databases/templates/databases/_resize_volume.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_volume.html
rename to trove_dashboard/content/databases/templates/databases/_resize_volume.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/index.html b/trove_dashboard/content/databases/templates/databases/index.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/index.html
rename to trove_dashboard/content/databases/templates/databases/index.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/launch.html b/trove_dashboard/content/databases/templates/databases/launch.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/launch.html
rename to trove_dashboard/content/databases/templates/databases/launch.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/resize_instance.html b/trove_dashboard/content/databases/templates/databases/resize_instance.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/resize_instance.html
rename to trove_dashboard/content/databases/templates/databases/resize_instance.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/resize_volume.html b/trove_dashboard/content/databases/templates/databases/resize_volume.html
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/templates/databases/resize_volume.html
rename to trove_dashboard/content/databases/templates/databases/resize_volume.html
diff --git a/openstack_dashboard/contrib/trove/content/databases/tests.py b/trove_dashboard/content/databases/tests.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/tests.py
rename to trove_dashboard/content/databases/tests.py
diff --git a/openstack_dashboard/contrib/trove/content/databases/urls.py b/trove_dashboard/content/databases/urls.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/urls.py
rename to trove_dashboard/content/databases/urls.py
diff --git a/openstack_dashboard/contrib/trove/content/databases/views.py b/trove_dashboard/content/databases/views.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/views.py
rename to trove_dashboard/content/databases/views.py
diff --git a/openstack_dashboard/contrib/trove/content/databases/workflows/__init__.py b/trove_dashboard/content/databases/workflows/__init__.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/workflows/__init__.py
rename to trove_dashboard/content/databases/workflows/__init__.py
diff --git a/openstack_dashboard/contrib/trove/content/databases/workflows/create_instance.py b/trove_dashboard/content/databases/workflows/create_instance.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/content/databases/workflows/create_instance.py
rename to trove_dashboard/content/databases/workflows/create_instance.py
diff --git a/openstack_dashboard/enabled/_1710_database_panel_group.py b/trove_dashboard/enabled/_1710_database_panel_group.py
similarity index 100%
rename from openstack_dashboard/enabled/_1710_database_panel_group.py
rename to trove_dashboard/enabled/_1710_database_panel_group.py
diff --git a/openstack_dashboard/enabled/_1720_project_databases_panel.py b/trove_dashboard/enabled/_1720_project_databases_panel.py
similarity index 100%
rename from openstack_dashboard/enabled/_1720_project_databases_panel.py
rename to trove_dashboard/enabled/_1720_project_databases_panel.py
diff --git a/openstack_dashboard/enabled/_1730_project_database_backups_panel.py b/trove_dashboard/enabled/_1730_project_database_backups_panel.py
similarity index 100%
rename from openstack_dashboard/enabled/_1730_project_database_backups_panel.py
rename to trove_dashboard/enabled/_1730_project_database_backups_panel.py
diff --git a/openstack_dashboard/enabled/_1740_project_database_clusters_panel.py b/trove_dashboard/enabled/_1740_project_database_clusters_panel.py
similarity index 100%
rename from openstack_dashboard/enabled/_1740_project_database_clusters_panel.py
rename to trove_dashboard/enabled/_1740_project_database_clusters_panel.py
diff --git a/openstack_dashboard/contrib/trove/test/__init__.py b/trove_dashboard/test/__init__.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/test/__init__.py
rename to trove_dashboard/test/__init__.py
diff --git a/openstack_dashboard/contrib/trove/test/helpers.py b/trove_dashboard/test/helpers.py
similarity index 100%
rename from openstack_dashboard/contrib/trove/test/helpers.py
rename to trove_dashboard/test/helpers.py
diff --git a/openstack_dashboard/test/test_data/trove_data.py b/trove_dashboard/test/test_data/trove_data.py
similarity index 100%
rename from openstack_dashboard/test/test_data/trove_data.py
rename to trove_dashboard/test/test_data/trove_data.py