diff --git a/puppet/zulip_internal/files/cron.d/graphite_backup b/puppet/zulip_internal/files/cron.d/graphite_backup
deleted file mode 100644
index e3de6d8293..0000000000
--- a/puppet/zulip_internal/files/cron.d/graphite_backup
+++ /dev/null
@@ -1,4 +0,0 @@
-MAILTO=root
-SHELL=/bin/bash
-
-0 3 * * * zulip /home/zulip/zulip/puppet/zulip_internal/files/graphite/daily_rsync_backup.sh
diff --git a/puppet/zulip_internal/manifests/init.pp b/puppet/zulip_internal/manifests/init.pp
deleted file mode 100644
index ff7d49bbf3..0000000000
--- a/puppet/zulip_internal/manifests/init.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-class zulip_internal {
-}
diff --git a/puppet/zulip_internal/manifests/redis.pp b/puppet/zulip_internal/manifests/redis.pp
deleted file mode 100644
index 76109d6b21..0000000000
--- a/puppet/zulip_internal/manifests/redis.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class zulip_internal::redis inherits zulip::redis {
-  include zulip_internal::base
-
-  File[ "/etc/redis/redis.conf"] {
-    source => "puppet:///modules/zulip_internal/redis/redis.conf",
-  }
-}
diff --git a/puppet/zulip_internal/files/apache/ports.conf b/puppet/zulip_ops/files/apache/ports.conf
similarity index 100%
rename from puppet/zulip_internal/files/apache/ports.conf
rename to puppet/zulip_ops/files/apache/ports.conf
diff --git a/puppet/zulip_internal/files/apache/sites/graphite b/puppet/zulip_ops/files/apache/sites/graphite
similarity index 100%
rename from puppet/zulip_internal/files/apache/sites/graphite
rename to puppet/zulip_ops/files/apache/sites/graphite
diff --git a/puppet/zulip_internal/files/apache/sites/graphiti b/puppet/zulip_ops/files/apache/sites/graphiti
similarity index 100%
rename from puppet/zulip_internal/files/apache/sites/graphiti
rename to puppet/zulip_ops/files/apache/sites/graphiti
diff --git a/puppet/zulip_internal/files/apache/sites/mediawiki b/puppet/zulip_ops/files/apache/sites/mediawiki
similarity index 100%
rename from puppet/zulip_internal/files/apache/sites/mediawiki
rename to puppet/zulip_ops/files/apache/sites/mediawiki
diff --git a/puppet/zulip_internal/files/apache/sites/nagios b/puppet/zulip_ops/files/apache/sites/nagios
similarity index 100%
rename from puppet/zulip_internal/files/apache/sites/nagios
rename to puppet/zulip_ops/files/apache/sites/nagios
diff --git a/puppet/zulip_internal/files/apache/sites/stats b/puppet/zulip_ops/files/apache/sites/stats
similarity index 100%
rename from puppet/zulip_internal/files/apache/sites/stats
rename to puppet/zulip_ops/files/apache/sites/stats
diff --git a/puppet/zulip_internal/files/apache/sites/trac b/puppet/zulip_ops/files/apache/sites/trac
similarity index 100%
rename from puppet/zulip_internal/files/apache/sites/trac
rename to puppet/zulip_ops/files/apache/sites/trac
diff --git a/puppet/zulip_internal/files/apt/apt.conf.d/02periodic b/puppet/zulip_ops/files/apt/apt.conf.d/02periodic
similarity index 100%
rename from puppet/zulip_internal/files/apt/apt.conf.d/02periodic
rename to puppet/zulip_ops/files/apt/apt.conf.d/02periodic
diff --git a/puppet/zulip_internal/files/builder/sbuildrc b/puppet/zulip_ops/files/builder/sbuildrc
similarity index 100%
rename from puppet/zulip_internal/files/builder/sbuildrc
rename to puppet/zulip_ops/files/builder/sbuildrc
diff --git a/puppet/zulip_internal/files/builder/ubuntu-archive-keyring.gpg b/puppet/zulip_ops/files/builder/ubuntu-archive-keyring.gpg
similarity index 100%
rename from puppet/zulip_internal/files/builder/ubuntu-archive-keyring.gpg
rename to puppet/zulip_ops/files/builder/ubuntu-archive-keyring.gpg
diff --git a/puppet/zulip_internal/files/certs/.gitignore b/puppet/zulip_ops/files/certs/.gitignore
similarity index 100%
rename from puppet/zulip_internal/files/certs/.gitignore
rename to puppet/zulip_ops/files/certs/.gitignore
diff --git a/puppet/zulip_internal/files/certs/chat.dropboxer.net.combined-chain.crt b/puppet/zulip_ops/files/certs/chat.dropboxer.net.combined-chain.crt
similarity index 100%
rename from puppet/zulip_internal/files/certs/chat.dropboxer.net.combined-chain.crt
rename to puppet/zulip_ops/files/certs/chat.dropboxer.net.combined-chain.crt
diff --git a/puppet/zulip_internal/files/certs/git.zulip.net.combined-chain.crt b/puppet/zulip_ops/files/certs/git.zulip.net.combined-chain.crt
similarity index 100%
rename from puppet/zulip_internal/files/certs/git.zulip.net.combined-chain.crt
rename to puppet/zulip_ops/files/certs/git.zulip.net.combined-chain.crt
diff --git a/puppet/zulip_internal/files/certs/git.zulip.net.crt b/puppet/zulip_ops/files/certs/git.zulip.net.crt
similarity index 100%
rename from puppet/zulip_internal/files/certs/git.zulip.net.crt
rename to puppet/zulip_ops/files/certs/git.zulip.net.crt
diff --git a/puppet/zulip_internal/files/certs/munin.zulip.net.combined-chain.crt b/puppet/zulip_ops/files/certs/munin.zulip.net.combined-chain.crt
similarity index 100%
rename from puppet/zulip_internal/files/certs/munin.zulip.net.combined-chain.crt
rename to puppet/zulip_ops/files/certs/munin.zulip.net.combined-chain.crt
diff --git a/puppet/zulip_internal/files/certs/munin.zulip.net.crt b/puppet/zulip_ops/files/certs/munin.zulip.net.crt
similarity index 100%
rename from puppet/zulip_internal/files/certs/munin.zulip.net.crt
rename to puppet/zulip_ops/files/certs/munin.zulip.net.crt
diff --git a/puppet/zulip_internal/files/certs/nagios.zulip.net.combined-chain.crt b/puppet/zulip_ops/files/certs/nagios.zulip.net.combined-chain.crt
similarity index 100%
rename from puppet/zulip_internal/files/certs/nagios.zulip.net.combined-chain.crt
rename to puppet/zulip_ops/files/certs/nagios.zulip.net.combined-chain.crt
diff --git a/puppet/zulip_internal/files/certs/nagios.zulip.net.crt b/puppet/zulip_ops/files/certs/nagios.zulip.net.crt
similarity index 100%
rename from puppet/zulip_internal/files/certs/nagios.zulip.net.crt
rename to puppet/zulip_ops/files/certs/nagios.zulip.net.crt
diff --git a/puppet/zulip_internal/files/certs/stats.zulip.net.combined-chain.crt b/puppet/zulip_ops/files/certs/stats.zulip.net.combined-chain.crt
similarity index 100%
rename from puppet/zulip_internal/files/certs/stats.zulip.net.combined-chain.crt
rename to puppet/zulip_ops/files/certs/stats.zulip.net.combined-chain.crt
diff --git a/puppet/zulip_internal/files/certs/stats.zulip.net.crt b/puppet/zulip_ops/files/certs/stats.zulip.net.crt
similarity index 100%
rename from puppet/zulip_internal/files/certs/stats.zulip.net.crt
rename to puppet/zulip_ops/files/certs/stats.zulip.net.crt
diff --git a/puppet/zulip_internal/files/certs/trac.zulip.net.combined-chain.crt b/puppet/zulip_ops/files/certs/trac.zulip.net.combined-chain.crt
similarity index 100%
rename from puppet/zulip_internal/files/certs/trac.zulip.net.combined-chain.crt
rename to puppet/zulip_ops/files/certs/trac.zulip.net.combined-chain.crt
diff --git a/puppet/zulip_internal/files/certs/trac.zulip.net.crt b/puppet/zulip_ops/files/certs/trac.zulip.net.crt
similarity index 100%
rename from puppet/zulip_internal/files/certs/trac.zulip.net.crt
rename to puppet/zulip_ops/files/certs/trac.zulip.net.crt
diff --git a/puppet/zulip_internal/files/certs/wildcard-all.combined-chain.crt b/puppet/zulip_ops/files/certs/wildcard-all.combined-chain.crt
similarity index 100%
rename from puppet/zulip_internal/files/certs/wildcard-all.combined-chain.crt
rename to puppet/zulip_ops/files/certs/wildcard-all.combined-chain.crt
diff --git a/puppet/zulip_internal/files/certs/wildcard-all.crt b/puppet/zulip_ops/files/certs/wildcard-all.crt
similarity index 100%
rename from puppet/zulip_internal/files/certs/wildcard-all.crt
rename to puppet/zulip_ops/files/certs/wildcard-all.crt
diff --git a/puppet/zulip_internal/files/cron.d/active-user-stats b/puppet/zulip_ops/files/cron.d/active-user-stats
similarity index 100%
rename from puppet/zulip_internal/files/cron.d/active-user-stats
rename to puppet/zulip_ops/files/cron.d/active-user-stats
diff --git a/puppet/zulip_internal/files/cron.d/check-apns-tokens b/puppet/zulip_ops/files/cron.d/check-apns-tokens
similarity index 100%
rename from puppet/zulip_internal/files/cron.d/check-apns-tokens
rename to puppet/zulip_ops/files/cron.d/check-apns-tokens
diff --git a/puppet/zulip_internal/files/cron.d/clearsessions b/puppet/zulip_ops/files/cron.d/clearsessions
similarity index 100%
rename from puppet/zulip_internal/files/cron.d/clearsessions
rename to puppet/zulip_ops/files/cron.d/clearsessions
diff --git a/puppet/zulip_ops/files/cron.d/graphite_backup b/puppet/zulip_ops/files/cron.d/graphite_backup
new file mode 100644
index 0000000000..36763e6774
--- /dev/null
+++ b/puppet/zulip_ops/files/cron.d/graphite_backup
@@ -0,0 +1,4 @@
+MAILTO=root
+SHELL=/bin/bash
+
+0 3 * * * zulip /home/zulip/zulip/puppet/zulip_ops/files/graphite/daily_rsync_backup.sh
diff --git a/puppet/zulip_internal/files/cron.d/log2zulip b/puppet/zulip_ops/files/cron.d/log2zulip
similarity index 100%
rename from puppet/zulip_internal/files/cron.d/log2zulip
rename to puppet/zulip_ops/files/cron.d/log2zulip
diff --git a/puppet/zulip_internal/files/cron.d/test_zephyr_personal_mirrors b/puppet/zulip_ops/files/cron.d/test_zephyr_personal_mirrors
similarity index 100%
rename from puppet/zulip_internal/files/cron.d/test_zephyr_personal_mirrors
rename to puppet/zulip_ops/files/cron.d/test_zephyr_personal_mirrors
diff --git a/puppet/zulip_internal/files/cron.d/zephyr-mirror b/puppet/zulip_ops/files/cron.d/zephyr-mirror
similarity index 100%
rename from puppet/zulip_internal/files/cron.d/zephyr-mirror
rename to puppet/zulip_ops/files/cron.d/zephyr-mirror
diff --git a/puppet/zulip_internal/files/graphite/aggregation-rules.conf b/puppet/zulip_ops/files/graphite/aggregation-rules.conf
similarity index 100%
rename from puppet/zulip_internal/files/graphite/aggregation-rules.conf
rename to puppet/zulip_ops/files/graphite/aggregation-rules.conf
diff --git a/puppet/zulip_internal/files/graphite/carbon.conf b/puppet/zulip_ops/files/graphite/carbon.conf
similarity index 100%
rename from puppet/zulip_internal/files/graphite/carbon.conf
rename to puppet/zulip_ops/files/graphite/carbon.conf
diff --git a/puppet/zulip_internal/files/graphite/daily_rsync_backup.sh b/puppet/zulip_ops/files/graphite/daily_rsync_backup.sh
similarity index 100%
rename from puppet/zulip_internal/files/graphite/daily_rsync_backup.sh
rename to puppet/zulip_ops/files/graphite/daily_rsync_backup.sh
diff --git a/puppet/zulip_internal/files/graphite/graphite.wsgi b/puppet/zulip_ops/files/graphite/graphite.wsgi
similarity index 100%
rename from puppet/zulip_internal/files/graphite/graphite.wsgi
rename to puppet/zulip_ops/files/graphite/graphite.wsgi
diff --git a/puppet/zulip_internal/files/graphite/local_settings.py b/puppet/zulip_ops/files/graphite/local_settings.py
similarity index 100%
rename from puppet/zulip_internal/files/graphite/local_settings.py
rename to puppet/zulip_ops/files/graphite/local_settings.py
diff --git a/puppet/zulip_internal/files/graphite/setup_disks.sh b/puppet/zulip_ops/files/graphite/setup_disks.sh
similarity index 100%
rename from puppet/zulip_internal/files/graphite/setup_disks.sh
rename to puppet/zulip_ops/files/graphite/setup_disks.sh
diff --git a/puppet/zulip_internal/files/graphite/storage-aggregation.conf b/puppet/zulip_ops/files/graphite/storage-aggregation.conf
similarity index 100%
rename from puppet/zulip_internal/files/graphite/storage-aggregation.conf
rename to puppet/zulip_ops/files/graphite/storage-aggregation.conf
diff --git a/puppet/zulip_internal/files/graphite/storage-schemas.conf b/puppet/zulip_ops/files/graphite/storage-schemas.conf
similarity index 100%
rename from puppet/zulip_internal/files/graphite/storage-schemas.conf
rename to puppet/zulip_ops/files/graphite/storage-schemas.conf
diff --git a/puppet/zulip_internal/files/graphiti/settings.yml b/puppet/zulip_ops/files/graphiti/settings.yml
similarity index 100%
rename from puppet/zulip_internal/files/graphiti/settings.yml
rename to puppet/zulip_ops/files/graphiti/settings.yml
diff --git a/puppet/zulip_internal/files/log2zulip.conf b/puppet/zulip_ops/files/log2zulip.conf
similarity index 100%
rename from puppet/zulip_internal/files/log2zulip.conf
rename to puppet/zulip_ops/files/log2zulip.conf
diff --git a/puppet/zulip_internal/files/log2zulip.zuliprc b/puppet/zulip_ops/files/log2zulip.zuliprc
similarity index 100%
rename from puppet/zulip_internal/files/log2zulip.zuliprc
rename to puppet/zulip_ops/files/log2zulip.zuliprc
diff --git a/puppet/zulip_internal/files/mediawiki/Auth_remoteuser.php b/puppet/zulip_ops/files/mediawiki/Auth_remoteuser.php
similarity index 100%
rename from puppet/zulip_internal/files/mediawiki/Auth_remoteuser.php
rename to puppet/zulip_ops/files/mediawiki/Auth_remoteuser.php
diff --git a/puppet/zulip_internal/files/mediawiki/LocalSettings.php b/puppet/zulip_ops/files/mediawiki/LocalSettings.php
similarity index 100%
rename from puppet/zulip_internal/files/mediawiki/LocalSettings.php
rename to puppet/zulip_ops/files/mediawiki/LocalSettings.php
diff --git a/puppet/zulip_internal/files/mediawiki/apache_config b/puppet/zulip_ops/files/mediawiki/apache_config
similarity index 100%
rename from puppet/zulip_internal/files/mediawiki/apache_config
rename to puppet/zulip_ops/files/mediawiki/apache_config
diff --git a/puppet/zulip_internal/files/motd.lb0 b/puppet/zulip_ops/files/motd.lb0
similarity index 100%
rename from puppet/zulip_internal/files/motd.lb0
rename to puppet/zulip_ops/files/motd.lb0
diff --git a/puppet/zulip_internal/files/munin-plugins/humbug_send_receive b/puppet/zulip_ops/files/munin-plugins/humbug_send_receive
similarity index 100%
rename from puppet/zulip_internal/files/munin-plugins/humbug_send_receive
rename to puppet/zulip_ops/files/munin-plugins/humbug_send_receive
diff --git a/puppet/zulip_internal/files/munin-plugins/rabbitmq_connections b/puppet/zulip_ops/files/munin-plugins/rabbitmq_connections
similarity index 100%
rename from puppet/zulip_internal/files/munin-plugins/rabbitmq_connections
rename to puppet/zulip_ops/files/munin-plugins/rabbitmq_connections
diff --git a/puppet/zulip_internal/files/munin-plugins/rabbitmq_consumers b/puppet/zulip_ops/files/munin-plugins/rabbitmq_consumers
similarity index 100%
rename from puppet/zulip_internal/files/munin-plugins/rabbitmq_consumers
rename to puppet/zulip_ops/files/munin-plugins/rabbitmq_consumers
diff --git a/puppet/zulip_internal/files/munin-plugins/rabbitmq_messages b/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages
similarity index 100%
rename from puppet/zulip_internal/files/munin-plugins/rabbitmq_messages
rename to puppet/zulip_ops/files/munin-plugins/rabbitmq_messages
diff --git a/puppet/zulip_internal/files/munin-plugins/rabbitmq_messages_unacknowledged b/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_unacknowledged
similarity index 100%
rename from puppet/zulip_internal/files/munin-plugins/rabbitmq_messages_unacknowledged
rename to puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_unacknowledged
diff --git a/puppet/zulip_internal/files/munin-plugins/rabbitmq_messages_uncommitted b/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_uncommitted
similarity index 100%
rename from puppet/zulip_internal/files/munin-plugins/rabbitmq_messages_uncommitted
rename to puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_uncommitted
diff --git a/puppet/zulip_internal/files/munin-plugins/rabbitmq_queue_memory b/puppet/zulip_ops/files/munin-plugins/rabbitmq_queue_memory
similarity index 100%
rename from puppet/zulip_internal/files/munin-plugins/rabbitmq_queue_memory
rename to puppet/zulip_ops/files/munin-plugins/rabbitmq_queue_memory
diff --git a/puppet/zulip_internal/files/munin-plugins/tornado_event_queues b/puppet/zulip_ops/files/munin-plugins/tornado_event_queues
similarity index 100%
rename from puppet/zulip_internal/files/munin-plugins/tornado_event_queues
rename to puppet/zulip_ops/files/munin-plugins/tornado_event_queues
diff --git a/puppet/zulip_internal/files/munin/munin-node.conf b/puppet/zulip_ops/files/munin/munin-node.conf
similarity index 100%
rename from puppet/zulip_internal/files/munin/munin-node.conf
rename to puppet/zulip_ops/files/munin/munin-node.conf
diff --git a/puppet/zulip_internal/files/munin/plugin-conf.d/munin-node.conf b/puppet/zulip_ops/files/munin/plugin-conf.d/munin-node.conf
similarity index 100%
rename from puppet/zulip_internal/files/munin/plugin-conf.d/munin-node.conf
rename to puppet/zulip_ops/files/munin/plugin-conf.d/munin-node.conf
diff --git a/puppet/zulip_internal/files/nagios3/cgi.cfg b/puppet/zulip_ops/files/nagios3/cgi.cfg
similarity index 100%
rename from puppet/zulip_internal/files/nagios3/cgi.cfg
rename to puppet/zulip_ops/files/nagios3/cgi.cfg
diff --git a/puppet/zulip_internal/files/nagios3/commands.cfg b/puppet/zulip_ops/files/nagios3/commands.cfg
similarity index 100%
rename from puppet/zulip_internal/files/nagios3/commands.cfg
rename to puppet/zulip_ops/files/nagios3/commands.cfg
diff --git a/puppet/zulip_internal/files/nagios3/conf.d/contacts.cfg b/puppet/zulip_ops/files/nagios3/conf.d/contacts.cfg
similarity index 100%
rename from puppet/zulip_internal/files/nagios3/conf.d/contacts.cfg
rename to puppet/zulip_ops/files/nagios3/conf.d/contacts.cfg
diff --git a/puppet/zulip_internal/files/nagios3/conf.d/generic-host_nagios2.cfg b/puppet/zulip_ops/files/nagios3/conf.d/generic-host_nagios2.cfg
similarity index 100%
rename from puppet/zulip_internal/files/nagios3/conf.d/generic-host_nagios2.cfg
rename to puppet/zulip_ops/files/nagios3/conf.d/generic-host_nagios2.cfg
diff --git a/puppet/zulip_internal/files/nagios3/conf.d/generic-service_nagios2.cfg b/puppet/zulip_ops/files/nagios3/conf.d/generic-service_nagios2.cfg
similarity index 100%
rename from puppet/zulip_internal/files/nagios3/conf.d/generic-service_nagios2.cfg
rename to puppet/zulip_ops/files/nagios3/conf.d/generic-service_nagios2.cfg
diff --git a/puppet/zulip_internal/files/nagios3/conf.d/hostgroups.cfg b/puppet/zulip_ops/files/nagios3/conf.d/hostgroups.cfg
similarity index 100%
rename from puppet/zulip_internal/files/nagios3/conf.d/hostgroups.cfg
rename to puppet/zulip_ops/files/nagios3/conf.d/hostgroups.cfg
diff --git a/puppet/zulip_internal/files/nagios3/conf.d/hosts.cfg b/puppet/zulip_ops/files/nagios3/conf.d/hosts.cfg
similarity index 100%
rename from puppet/zulip_internal/files/nagios3/conf.d/hosts.cfg
rename to puppet/zulip_ops/files/nagios3/conf.d/hosts.cfg
diff --git a/puppet/zulip_internal/files/nagios3/conf.d/localhost.cfg b/puppet/zulip_ops/files/nagios3/conf.d/localhost.cfg
similarity index 100%
rename from puppet/zulip_internal/files/nagios3/conf.d/localhost.cfg
rename to puppet/zulip_ops/files/nagios3/conf.d/localhost.cfg
diff --git a/puppet/zulip_internal/files/nagios3/conf.d/pagerduty_nagios.cfg b/puppet/zulip_ops/files/nagios3/conf.d/pagerduty_nagios.cfg
similarity index 100%
rename from puppet/zulip_internal/files/nagios3/conf.d/pagerduty_nagios.cfg
rename to puppet/zulip_ops/files/nagios3/conf.d/pagerduty_nagios.cfg
diff --git a/puppet/zulip_internal/files/nagios3/conf.d/services.cfg b/puppet/zulip_ops/files/nagios3/conf.d/services.cfg
similarity index 100%
rename from puppet/zulip_internal/files/nagios3/conf.d/services.cfg
rename to puppet/zulip_ops/files/nagios3/conf.d/services.cfg
diff --git a/puppet/zulip_internal/files/nagios3/conf.d/timeperiods_nagios2.cfg b/puppet/zulip_ops/files/nagios3/conf.d/timeperiods_nagios2.cfg
similarity index 100%
rename from puppet/zulip_internal/files/nagios3/conf.d/timeperiods_nagios2.cfg
rename to puppet/zulip_ops/files/nagios3/conf.d/timeperiods_nagios2.cfg
diff --git a/puppet/zulip_internal/files/nagios3/nagios.cfg b/puppet/zulip_ops/files/nagios3/nagios.cfg
similarity index 100%
rename from puppet/zulip_internal/files/nagios3/nagios.cfg
rename to puppet/zulip_ops/files/nagios3/nagios.cfg
diff --git a/puppet/zulip_internal/files/nagios3/resource.cfg b/puppet/zulip_ops/files/nagios3/resource.cfg
similarity index 100%
rename from puppet/zulip_internal/files/nagios3/resource.cfg
rename to puppet/zulip_ops/files/nagios3/resource.cfg
diff --git a/puppet/zulip_internal/files/nagios3/zuliprc b/puppet/zulip_ops/files/nagios3/zuliprc
similarity index 100%
rename from puppet/zulip_internal/files/nagios3/zuliprc
rename to puppet/zulip_ops/files/nagios3/zuliprc
diff --git a/puppet/zulip_internal/files/nagios_crontab b/puppet/zulip_ops/files/nagios_crontab
similarity index 100%
rename from puppet/zulip_internal/files/nagios_crontab
rename to puppet/zulip_ops/files/nagios_crontab
diff --git a/puppet/zulip_internal/files/nagios_plugins/zulip_zephyr_mirror/check_personal_zephyr_mirrors b/puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_personal_zephyr_mirrors
similarity index 100%
rename from puppet/zulip_internal/files/nagios_plugins/zulip_zephyr_mirror/check_personal_zephyr_mirrors
rename to puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_personal_zephyr_mirrors
diff --git a/puppet/zulip_internal/files/nagios_plugins/zulip_zephyr_mirror/check_user_zephyr_mirror_liveness b/puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_user_zephyr_mirror_liveness
similarity index 100%
rename from puppet/zulip_internal/files/nagios_plugins/zulip_zephyr_mirror/check_user_zephyr_mirror_liveness
rename to puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_user_zephyr_mirror_liveness
diff --git a/puppet/zulip_internal/files/nagios_plugins/zulip_zephyr_mirror/check_zephyr_mirror b/puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_zephyr_mirror
similarity index 100%
rename from puppet/zulip_internal/files/nagios_plugins/zulip_zephyr_mirror/check_zephyr_mirror
rename to puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_zephyr_mirror
diff --git a/puppet/zulip_internal/files/nginx/sites-available/loadbalancer b/puppet/zulip_ops/files/nginx/sites-available/loadbalancer
similarity index 100%
rename from puppet/zulip_internal/files/nginx/sites-available/loadbalancer
rename to puppet/zulip_ops/files/nginx/sites-available/loadbalancer
diff --git a/puppet/zulip_internal/files/nginx/sites-available/zulip b/puppet/zulip_ops/files/nginx/sites-available/zulip
similarity index 100%
rename from puppet/zulip_internal/files/nginx/sites-available/zulip
rename to puppet/zulip_ops/files/nginx/sites-available/zulip
diff --git a/puppet/zulip_internal/files/nginx/sites-available/zulip-staging b/puppet/zulip_ops/files/nginx/sites-available/zulip-staging
similarity index 100%
rename from puppet/zulip_internal/files/nginx/sites-available/zulip-staging
rename to puppet/zulip_ops/files/nginx/sites-available/zulip-staging
diff --git a/puppet/zulip_internal/files/pagerduty_nagios.pl b/puppet/zulip_ops/files/pagerduty_nagios.pl
similarity index 100%
rename from puppet/zulip_internal/files/pagerduty_nagios.pl
rename to puppet/zulip_ops/files/pagerduty_nagios.pl
diff --git a/puppet/zulip_internal/files/postgresql/40-postgresql.conf.master b/puppet/zulip_ops/files/postgresql/40-postgresql.conf.master
similarity index 100%
rename from puppet/zulip_internal/files/postgresql/40-postgresql.conf.master
rename to puppet/zulip_ops/files/postgresql/40-postgresql.conf.master
diff --git a/puppet/zulip_internal/files/postgresql/40-postgresql.conf.slave b/puppet/zulip_ops/files/postgresql/40-postgresql.conf.slave
similarity index 100%
rename from puppet/zulip_internal/files/postgresql/40-postgresql.conf.slave
rename to puppet/zulip_ops/files/postgresql/40-postgresql.conf.slave
diff --git a/puppet/zulip_internal/files/postgresql/40-postgresql.conf.trac b/puppet/zulip_ops/files/postgresql/40-postgresql.conf.trac
similarity index 100%
rename from puppet/zulip_internal/files/postgresql/40-postgresql.conf.trac
rename to puppet/zulip_ops/files/postgresql/40-postgresql.conf.trac
diff --git a/puppet/zulip_internal/files/postgresql/pg_hba.conf b/puppet/zulip_ops/files/postgresql/pg_hba.conf
similarity index 100%
rename from puppet/zulip_internal/files/postgresql/pg_hba.conf
rename to puppet/zulip_ops/files/postgresql/pg_hba.conf
diff --git a/puppet/zulip_internal/files/postgresql/postgresql.conf.master b/puppet/zulip_ops/files/postgresql/postgresql.conf.master
similarity index 100%
rename from puppet/zulip_internal/files/postgresql/postgresql.conf.master
rename to puppet/zulip_ops/files/postgresql/postgresql.conf.master
diff --git a/puppet/zulip_internal/files/postgresql/postgresql.conf.slave b/puppet/zulip_ops/files/postgresql/postgresql.conf.slave
similarity index 100%
rename from puppet/zulip_internal/files/postgresql/postgresql.conf.slave
rename to puppet/zulip_ops/files/postgresql/postgresql.conf.slave
diff --git a/puppet/zulip_internal/files/postgresql/postgresql.conf.trac b/puppet/zulip_ops/files/postgresql/postgresql.conf.trac
similarity index 100%
rename from puppet/zulip_internal/files/postgresql/postgresql.conf.trac
rename to puppet/zulip_ops/files/postgresql/postgresql.conf.trac
diff --git a/puppet/zulip_internal/files/postgresql/recovery.conf b/puppet/zulip_ops/files/postgresql/recovery.conf
similarity index 100%
rename from puppet/zulip_internal/files/postgresql/recovery.conf
rename to puppet/zulip_ops/files/postgresql/recovery.conf
diff --git a/puppet/zulip_internal/files/postgresql/setup_disks.sh b/puppet/zulip_ops/files/postgresql/setup_disks.sh
similarity index 100%
rename from puppet/zulip_internal/files/postgresql/setup_disks.sh
rename to puppet/zulip_ops/files/postgresql/setup_disks.sh
diff --git a/puppet/zulip_internal/files/redis/redis.conf b/puppet/zulip_ops/files/redis/redis.conf
similarity index 100%
rename from puppet/zulip_internal/files/redis/redis.conf
rename to puppet/zulip_ops/files/redis/redis.conf
diff --git a/puppet/zulip_internal/files/sparkle/mac/sparkle-changelog.html b/puppet/zulip_ops/files/sparkle/mac/sparkle-changelog.html
similarity index 100%
rename from puppet/zulip_internal/files/sparkle/mac/sparkle-changelog.html
rename to puppet/zulip_ops/files/sparkle/mac/sparkle-changelog.html
diff --git a/puppet/zulip_internal/files/sparkle/mac/sparkle.xml b/puppet/zulip_ops/files/sparkle/mac/sparkle.xml
similarity index 100%
rename from puppet/zulip_internal/files/sparkle/mac/sparkle.xml
rename to puppet/zulip_ops/files/sparkle/mac/sparkle.xml
diff --git a/puppet/zulip_internal/files/sparkle/sso/mac/sparkle-changelog.html b/puppet/zulip_ops/files/sparkle/sso/mac/sparkle-changelog.html
similarity index 100%
rename from puppet/zulip_internal/files/sparkle/sso/mac/sparkle-changelog.html
rename to puppet/zulip_ops/files/sparkle/sso/mac/sparkle-changelog.html
diff --git a/puppet/zulip_internal/files/sparkle/sso/mac/sparkle.xml b/puppet/zulip_ops/files/sparkle/sso/mac/sparkle.xml
similarity index 100%
rename from puppet/zulip_internal/files/sparkle/sso/mac/sparkle.xml
rename to puppet/zulip_ops/files/sparkle/sso/mac/sparkle.xml
diff --git a/puppet/zulip_internal/files/sparkle/sso/win/sparkle-changelog.html b/puppet/zulip_ops/files/sparkle/sso/win/sparkle-changelog.html
similarity index 100%
rename from puppet/zulip_internal/files/sparkle/sso/win/sparkle-changelog.html
rename to puppet/zulip_ops/files/sparkle/sso/win/sparkle-changelog.html
diff --git a/puppet/zulip_internal/files/sparkle/sso/win/sparkle.xml b/puppet/zulip_ops/files/sparkle/sso/win/sparkle.xml
similarity index 100%
rename from puppet/zulip_internal/files/sparkle/sso/win/sparkle.xml
rename to puppet/zulip_ops/files/sparkle/sso/win/sparkle.xml
diff --git a/puppet/zulip_internal/files/sparkle/win/sparkle-changelog.html b/puppet/zulip_ops/files/sparkle/win/sparkle-changelog.html
similarity index 100%
rename from puppet/zulip_internal/files/sparkle/win/sparkle-changelog.html
rename to puppet/zulip_ops/files/sparkle/win/sparkle-changelog.html
diff --git a/puppet/zulip_internal/files/sparkle/win/sparkle.xml b/puppet/zulip_ops/files/sparkle/win/sparkle.xml
similarity index 100%
rename from puppet/zulip_internal/files/sparkle/win/sparkle.xml
rename to puppet/zulip_ops/files/sparkle/win/sparkle.xml
diff --git a/puppet/zulip_internal/files/sshd_config b/puppet/zulip_ops/files/sshd_config
similarity index 100%
rename from puppet/zulip_internal/files/sshd_config
rename to puppet/zulip_ops/files/sshd_config
diff --git a/puppet/zulip_internal/files/statsd/local.js b/puppet/zulip_ops/files/statsd/local.js
similarity index 100%
rename from puppet/zulip_internal/files/statsd/local.js
rename to puppet/zulip_ops/files/statsd/local.js
diff --git a/puppet/zulip_internal/files/statsd/redis.conf b/puppet/zulip_ops/files/statsd/redis.conf
similarity index 100%
rename from puppet/zulip_internal/files/statsd/redis.conf
rename to puppet/zulip_ops/files/statsd/redis.conf
diff --git a/puppet/zulip_internal/files/supervisor/conf.d/redis_tunnel.conf.staging b/puppet/zulip_ops/files/supervisor/conf.d/redis_tunnel.conf.staging
similarity index 100%
rename from puppet/zulip_internal/files/supervisor/conf.d/redis_tunnel.conf.staging
rename to puppet/zulip_ops/files/supervisor/conf.d/redis_tunnel.conf.staging
diff --git a/puppet/zulip_internal/files/supervisor/conf.d/stats.conf b/puppet/zulip_ops/files/supervisor/conf.d/stats.conf
similarity index 100%
rename from puppet/zulip_internal/files/supervisor/conf.d/stats.conf
rename to puppet/zulip_ops/files/supervisor/conf.d/stats.conf
diff --git a/puppet/zulip_internal/files/supervisor/conf.d/zmirror.conf b/puppet/zulip_ops/files/supervisor/conf.d/zmirror.conf
similarity index 100%
rename from puppet/zulip_internal/files/supervisor/conf.d/zmirror.conf
rename to puppet/zulip_ops/files/supervisor/conf.d/zmirror.conf
diff --git a/puppet/zulip_internal/files/trac.ini b/puppet/zulip_ops/files/trac.ini
similarity index 100%
rename from puppet/zulip_internal/files/trac.ini
rename to puppet/zulip_ops/files/trac.ini
diff --git a/puppet/zulip_internal/files/trac/cgi-bin/trac.cgi b/puppet/zulip_ops/files/trac/cgi-bin/trac.cgi
similarity index 100%
rename from puppet/zulip_internal/files/trac/cgi-bin/trac.cgi
rename to puppet/zulip_ops/files/trac/cgi-bin/trac.cgi
diff --git a/puppet/zulip_internal/files/trac/cgi-bin/trac.fcgi b/puppet/zulip_ops/files/trac/cgi-bin/trac.fcgi
similarity index 100%
rename from puppet/zulip_internal/files/trac/cgi-bin/trac.fcgi
rename to puppet/zulip_ops/files/trac/cgi-bin/trac.fcgi
diff --git a/puppet/zulip_internal/files/trac/cgi-bin/trac.wsgi b/puppet/zulip_ops/files/trac/cgi-bin/trac.wsgi
similarity index 100%
rename from puppet/zulip_internal/files/trac/cgi-bin/trac.wsgi
rename to puppet/zulip_ops/files/trac/cgi-bin/trac.wsgi
diff --git a/puppet/zulip_internal/files/zephyr-clients.debathena b/puppet/zulip_ops/files/zephyr-clients.debathena
similarity index 100%
rename from puppet/zulip_internal/files/zephyr-clients.debathena
rename to puppet/zulip_ops/files/zephyr-clients.debathena
diff --git a/puppet/zulip_internal/files/zulip-ec2-configure-interfaces b/puppet/zulip_ops/files/zulip-ec2-configure-interfaces
similarity index 100%
rename from puppet/zulip_internal/files/zulip-ec2-configure-interfaces
rename to puppet/zulip_ops/files/zulip-ec2-configure-interfaces
diff --git a/puppet/zulip_internal/files/zulip-ec2-configure-interfaces_if-up.d.sh b/puppet/zulip_ops/files/zulip-ec2-configure-interfaces_if-up.d.sh
similarity index 100%
rename from puppet/zulip_internal/files/zulip-ec2-configure-interfaces_if-up.d.sh
rename to puppet/zulip_ops/files/zulip-ec2-configure-interfaces_if-up.d.sh
diff --git a/puppet/zulip_internal/manifests/apache.pp b/puppet/zulip_ops/manifests/apache.pp
similarity index 83%
rename from puppet/zulip_internal/manifests/apache.pp
rename to puppet/zulip_ops/manifests/apache.pp
index 382c85f670..f7c54d0eae 100644
--- a/puppet/zulip_internal/manifests/apache.pp
+++ b/puppet/zulip_ops/manifests/apache.pp
@@ -1,4 +1,4 @@
-class zulip_internal::apache {
+class zulip_ops::apache {
   $apache_packages = [# Needed to run Apache with WSGI
                       "apache2",
                       "libapache2-mod-wsgi",
@@ -24,7 +24,7 @@ class zulip_internal::apache {
     owner  => "www-data",
     group  => "www-data",
     mode => 600,
-    source => "puppet:///modules/zulip_internal/apache/users",
+    source => "puppet:///modules/zulip_ops/apache/users",
   }
 
   file { "/etc/apache2/certs/":
@@ -41,7 +41,7 @@ class zulip_internal::apache {
     owner  => "root",
     group  => "root",
     mode => 640,
-    source => "puppet:///modules/zulip_internal/apache/ports.conf",
+    source => "puppet:///modules/zulip_ops/apache/ports.conf",
   }
 
   file { "/etc/apache2/sites-available/":
@@ -50,6 +50,6 @@ class zulip_internal::apache {
     owner  => "root",
     group  => "root",
     mode => 640,
-    source => "puppet:///modules/zulip_internal/apache/sites/",
+    source => "puppet:///modules/zulip_ops/apache/sites/",
   }
 }
diff --git a/puppet/zulip_internal/manifests/app_frontend.pp b/puppet/zulip_ops/manifests/app_frontend.pp
similarity index 72%
rename from puppet/zulip_internal/manifests/app_frontend.pp
rename to puppet/zulip_ops/manifests/app_frontend.pp
index bac80cd96b..a317c2c50f 100644
--- a/puppet/zulip_internal/manifests/app_frontend.pp
+++ b/puppet/zulip_ops/manifests/app_frontend.pp
@@ -1,4 +1,4 @@
-class zulip_internal::app_frontend {
+class zulip_ops::app_frontend {
   include zulip::app_frontend_base
   include zulip::memcached
   include zulip::rabbit
@@ -14,7 +14,7 @@ class zulip_internal::app_frontend {
     owner      => "zulip",
     group      => "zulip",
     mode       => 644,
-    source     => 'puppet:///modules/zulip_internal/log2zulip.conf',
+    source     => 'puppet:///modules/zulip_ops/log2zulip.conf',
   }
 
   file { '/etc/cron.d/log2zulip':
@@ -22,7 +22,7 @@ class zulip_internal::app_frontend {
     owner      => "root",
     group      => "root",
     mode       => 644,
-    source     => 'puppet:///modules/zulip_internal/cron.d/log2zulip',
+    source     => 'puppet:///modules/zulip_ops/cron.d/log2zulip',
   }
 
   file { '/etc/log2zulip.zuliprc':
@@ -30,13 +30,13 @@ class zulip_internal::app_frontend {
     owner      => "zulip",
     group      => "zulip",
     mode       => 600,
-    source     => 'puppet:///modules/zulip_internal/log2zulip.zuliprc',
+    source     => 'puppet:///modules/zulip_ops/log2zulip.zuliprc',
   }
   file { "/etc/cron.d/check-apns-tokens":
     ensure => file,
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/cron.d/check-apns-tokens",
+    source => "puppet:///modules/zulip_ops/cron.d/check-apns-tokens",
   }
 }
diff --git a/puppet/zulip_internal/manifests/base.pp b/puppet/zulip_ops/manifests/base.pp
similarity index 86%
rename from puppet/zulip_internal/manifests/base.pp
rename to puppet/zulip_ops/manifests/base.pp
index aa2b9b7f1a..5204ef0309 100644
--- a/puppet/zulip_internal/manifests/base.pp
+++ b/puppet/zulip_ops/manifests/base.pp
@@ -1,4 +1,4 @@
-class zulip_internal::base {
+class zulip_ops::base {
   include zulip::base
 
   $org_base_packages = [# Management for our systems
@@ -40,7 +40,7 @@ class zulip_internal::base {
   file { '/etc/apt/apt.conf.d/02periodic':
     ensure     => file,
     mode       => 644,
-    source     => 'puppet:///modules/zulip_internal/apt/apt.conf.d/02periodic',
+    source     => 'puppet:///modules/zulip_ops/apt/apt.conf.d/02periodic',
   }
 
   file { '/home/zulip/.ssh/authorized_keys':
@@ -49,7 +49,7 @@ class zulip_internal::base {
     mode       => 600,
     owner      => "zulip",
     group      => "zulip",
-    source     => 'puppet:///modules/zulip_internal/authorized_keys',
+    source     => 'puppet:///modules/zulip_ops/authorized_keys',
   }
   file { '/home/zulip/.ssh':
     ensure     => directory,
@@ -62,7 +62,7 @@ class zulip_internal::base {
   file { '/etc/ssh/sshd_config':
     require    => Package['openssh-server'],
     ensure     => file,
-    source     => 'puppet:///modules/zulip_internal/sshd_config',
+    source     => 'puppet:///modules/zulip_ops/sshd_config',
     owner      => 'root',
     group      => 'root',
     mode       => 644,
@@ -78,19 +78,19 @@ class zulip_internal::base {
     mode       => 600,
     owner      => "root",
     group      => "root",
-    source     => 'puppet:///modules/zulip_internal/root_authorized_keys',
+    source     => 'puppet:///modules/zulip_ops/root_authorized_keys',
   }
 
   file { '/usr/local/sbin/zulip-ec2-configure-interfaces':
     ensure     => file,
     mode       => 755,
-    source     => 'puppet:///modules/zulip_internal/zulip-ec2-configure-interfaces',
+    source     => 'puppet:///modules/zulip_ops/zulip-ec2-configure-interfaces',
   }
 
   file { '/etc/network/if-up.d/zulip-ec2-configure-interfaces_if-up.d.sh':
     ensure     => file,
     mode       => 755,
-    source     => 'puppet:///modules/zulip_internal/zulip-ec2-configure-interfaces_if-up.d.sh',
+    source     => 'puppet:///modules/zulip_ops/zulip-ec2-configure-interfaces_if-up.d.sh',
   }
 
   group { 'nagios':
@@ -125,7 +125,7 @@ class zulip_internal::base {
     mode       => 600,
     owner      => "nagios",
     group      => "nagios",
-    source     => 'puppet:///modules/zulip_internal/nagios_authorized_keys',
+    source     => 'puppet:///modules/zulip_ops/nagios_authorized_keys',
   }
   file { '/home/nagios':
     ensure => absent,
@@ -135,7 +135,7 @@ class zulip_internal::base {
   file { '/etc/iptables/rules.v4':
     ensure     => file,
     mode       => 600,
-    content    => template('zulip_internal/iptables/rules.v4.erb'),
+    content    => template('zulip_ops/iptables/rules.v4.erb'),
     require    => Package['iptables-persistent'],
   }
   service { 'iptables-persistent':
diff --git a/puppet/zulip_internal/manifests/bots.pp b/puppet/zulip_ops/manifests/bots.pp
similarity index 64%
rename from puppet/zulip_internal/manifests/bots.pp
rename to puppet/zulip_ops/manifests/bots.pp
index f1f29980c3..078714afd4 100644
--- a/puppet/zulip_internal/manifests/bots.pp
+++ b/puppet/zulip_ops/manifests/bots.pp
@@ -1,5 +1,5 @@
-class zulip_internal::bots {
-  include zulip_internal::base
+class zulip_ops::bots {
+  include zulip_ops::base
   include zulip::supervisor
 
   file { '/etc/supervisor/conf.d/feedback-bot.conf':
diff --git a/puppet/zulip_internal/manifests/builder.pp b/puppet/zulip_ops/manifests/builder.pp
similarity index 83%
rename from puppet/zulip_internal/manifests/builder.pp
rename to puppet/zulip_ops/manifests/builder.pp
index bd0d4a02a4..fe2c302a87 100644
--- a/puppet/zulip_internal/manifests/builder.pp
+++ b/puppet/zulip_ops/manifests/builder.pp
@@ -1,5 +1,5 @@
-class zulip_internal::builder {
-  include zulip_internal::base
+class zulip_ops::builder {
+  include zulip_ops::base
 
   $buildd_packages = [
     # Useful tools for packaging
@@ -18,13 +18,13 @@ class zulip_internal::builder {
     owner  => "zulip",
     group  => "zulip",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/builder/sbuildrc",
+    source => "puppet:///modules/zulip_ops/builder/sbuildrc",
   }
 
   file { "/usr/share/keyrings/ubuntu-archive-keyring.gpg":
     ensure => file,
     mode => 644,
-    source => "puppet:///modules/zulip_internal/builder/ubuntu-archive-keyring.gpg",
+    source => "puppet:///modules/zulip_ops/builder/ubuntu-archive-keyring.gpg",
   }
 
 
diff --git a/puppet/zulip_internal/manifests/git.pp b/puppet/zulip_ops/manifests/git.pp
similarity index 86%
rename from puppet/zulip_internal/manifests/git.pp
rename to puppet/zulip_ops/manifests/git.pp
index e2997ba3b1..c7e135fb16 100644
--- a/puppet/zulip_internal/manifests/git.pp
+++ b/puppet/zulip_ops/manifests/git.pp
@@ -1,5 +1,5 @@
-class zulip_internal::git {
-  include zulip_internal::base
+class zulip_ops::git {
+  include zulip_ops::base
 
   $git_packages = [ ]
   package { $git_packages: ensure => "installed" }
diff --git a/puppet/zulip_ops/manifests/init.pp b/puppet/zulip_ops/manifests/init.pp
new file mode 100644
index 0000000000..a94ccbc2a4
--- /dev/null
+++ b/puppet/zulip_ops/manifests/init.pp
@@ -0,0 +1,2 @@
+class zulip_ops {
+}
diff --git a/puppet/zulip_internal/manifests/loadbalancer.pp b/puppet/zulip_ops/manifests/loadbalancer.pp
similarity index 69%
rename from puppet/zulip_internal/manifests/loadbalancer.pp
rename to puppet/zulip_ops/manifests/loadbalancer.pp
index 116b053c3d..d969b2c0d0 100644
--- a/puppet/zulip_internal/manifests/loadbalancer.pp
+++ b/puppet/zulip_ops/manifests/loadbalancer.pp
@@ -1,5 +1,5 @@
-class zulip_internal::loadbalancer {
-  include zulip_internal::base
+class zulip_ops::loadbalancer {
+  include zulip_ops::base
   include zulip::nginx
   include zulip::camo
 
@@ -9,7 +9,7 @@ class zulip_internal::loadbalancer {
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/nginx/sites-available/loadbalancer",
+    source => "puppet:///modules/zulip_ops/nginx/sites-available/loadbalancer",
     notify => Service["nginx"],
   }
 
@@ -18,7 +18,7 @@ class zulip_internal::loadbalancer {
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/motd.lb0",
+    source => "puppet:///modules/zulip_ops/motd.lb0",
   }
 
   file { '/etc/nginx/sites-enabled/loadbalancer':
@@ -33,7 +33,7 @@ class zulip_internal::loadbalancer {
     owner      => "zulip",
     group      => "zulip",
     mode       => 644,
-    source     => 'puppet:///modules/zulip_internal/log2zulip.conf',
+    source     => 'puppet:///modules/zulip_ops/log2zulip.conf',
   }
 
   file { '/etc/cron.d/log2zulip':
@@ -41,7 +41,7 @@ class zulip_internal::loadbalancer {
     owner      => "root",
     group      => "root",
     mode       => 644,
-    source     => 'puppet:///modules/zulip_internal/cron.d/log2zulip',
+    source     => 'puppet:///modules/zulip_ops/cron.d/log2zulip',
   }
 
   file { '/etc/log2zulip.zuliprc':
@@ -49,6 +49,6 @@ class zulip_internal::loadbalancer {
     owner      => "zulip",
     group      => "zulip",
     mode       => 600,
-    source     => 'puppet:///modules/zulip_internal/log2zulip.zuliprc',
+    source     => 'puppet:///modules/zulip_ops/log2zulip.zuliprc',
   }
 }
diff --git a/puppet/zulip_internal/manifests/mediawiki.pp b/puppet/zulip_ops/manifests/mediawiki.pp
similarity index 81%
rename from puppet/zulip_internal/manifests/mediawiki.pp
rename to puppet/zulip_ops/manifests/mediawiki.pp
index 05b829b228..ff21e61db9 100644
--- a/puppet/zulip_internal/manifests/mediawiki.pp
+++ b/puppet/zulip_ops/manifests/mediawiki.pp
@@ -1,5 +1,5 @@
-class zulip_internal::mediawiki {
-  include zulip_internal::postgres_common
+class zulip_ops::mediawiki {
+  include zulip_ops::postgres_common
 
 
   $mediawiki_packages = [# Packages needed for mediawiki
@@ -20,7 +20,7 @@ class zulip_internal::mediawiki {
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/mediawiki/LocalSettings.php",
+    source => "puppet:///modules/zulip_ops/mediawiki/LocalSettings.php",
   }
 
   file { '/usr/local/share/mediawiki/extensions/Auth_remoteuser.php':
@@ -28,7 +28,7 @@ class zulip_internal::mediawiki {
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/mediawiki/Auth_remoteuser.php",
+    source => "puppet:///modules/zulip_ops/mediawiki/Auth_remoteuser.php",
   }
 
   file { '/etc/mediawiki-extensions/extensions-available/Auth_remoteuser.php':
diff --git a/puppet/zulip_internal/manifests/munin.pp b/puppet/zulip_ops/manifests/munin.pp
similarity index 82%
rename from puppet/zulip_internal/manifests/munin.pp
rename to puppet/zulip_ops/manifests/munin.pp
index adfd7fe9e2..1a48b95af7 100644
--- a/puppet/zulip_internal/manifests/munin.pp
+++ b/puppet/zulip_ops/manifests/munin.pp
@@ -1,4 +1,4 @@
-class zulip_internal::munin {
+class zulip_ops::munin {
   include zulip::supervisor
 
   $munin_packages = [# Packages needed for munin
@@ -28,7 +28,7 @@ class zulip_internal::munin {
     owner => "root",
     group => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/munin"
+    source => "puppet:///modules/zulip_ops/munin"
   }
 
   file { "/etc/munin/munin.conf":
@@ -37,7 +37,7 @@ class zulip_internal::munin {
     owner => "root",
     group => "root",
     mode => 644,
-    content => template("zulip_internal/munin/munin.conf.erb")
+    content => template("zulip_ops/munin/munin.conf.erb")
   }
 
   file { "/etc/supervisor/conf.d/munin_tunnels.conf":
@@ -46,7 +46,7 @@ class zulip_internal::munin {
     mode   => 644,
     owner  => "root",
     group  => "root",
-    content => template("zulip_internal/supervisor/conf.d/munin_tunnels.conf.erb"),
+    content => template("zulip_ops/supervisor/conf.d/munin_tunnels.conf.erb"),
     notify => Service["supervisor"]
   }
 }
diff --git a/puppet/zulip_internal/manifests/nagios.pp b/puppet/zulip_ops/manifests/nagios.pp
similarity index 86%
rename from puppet/zulip_internal/manifests/nagios.pp
rename to puppet/zulip_ops/manifests/nagios.pp
index eae81a3fb4..e87ff5cb82 100644
--- a/puppet/zulip_internal/manifests/nagios.pp
+++ b/puppet/zulip_ops/manifests/nagios.pp
@@ -1,6 +1,6 @@
-class zulip_internal::nagios {
-  include zulip_internal::base
-  include zulip_internal::apache
+class zulip_ops::nagios {
+  include zulip_ops::base
+  include zulip_ops::apache
   include zulip::nagios
 
   $nagios_packages = [# Packages needed for Nagios
@@ -22,7 +22,7 @@ class zulip_internal::nagios {
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/nagios3/",
+    source => "puppet:///modules/zulip_ops/nagios3/",
     notify => Service["nagios3"],
   }
 
@@ -35,7 +35,7 @@ class zulip_internal::nagios {
     mode       => 755,
     owner      => "root",
     group      => "root",
-    source     => 'puppet:///modules/zulip_internal/pagerduty_nagios.pl',
+    source     => 'puppet:///modules/zulip_ops/pagerduty_nagios.pl',
   }
 
   file { '/etc/nagios3/conf.d/zulip_nagios.cfg':
@@ -71,7 +71,7 @@ class zulip_internal::nagios {
     owner  => "nagios",
     group  => "crontab",
     mode => 600,
-    source => "puppet:///modules/zulip_internal/nagios_crontab",
+    source => "puppet:///modules/zulip_ops/nagios_crontab",
   }
 
   # TODO: Install our API
diff --git a/puppet/zulip_internal/manifests/postgres_appdb.pp b/puppet/zulip_ops/manifests/postgres_appdb.pp
similarity index 64%
rename from puppet/zulip_internal/manifests/postgres_appdb.pp
rename to puppet/zulip_ops/manifests/postgres_appdb.pp
index a8624160a6..3f6c655774 100644
--- a/puppet/zulip_internal/manifests/postgres_appdb.pp
+++ b/puppet/zulip_ops/manifests/postgres_appdb.pp
@@ -1,5 +1,5 @@
-class zulip_internal::postgres_appdb {
-  include zulip_internal::postgres_common
+class zulip_ops::postgres_appdb {
+  include zulip_ops::postgres_common
   include zulip::postgres_appdb_base
 
   file { "/etc/postgresql/${zulip::base::postgres_version}/main/pg_hba.conf":
@@ -8,6 +8,6 @@ class zulip_internal::postgres_appdb {
     owner  => "postgres",
     group  => "postgres",
     mode => 640,
-    source => "puppet:///modules/zulip_internal/postgresql/pg_hba.conf",
+    source => "puppet:///modules/zulip_ops/postgresql/pg_hba.conf",
   }
 }
diff --git a/puppet/zulip_internal/manifests/postgres_common.pp b/puppet/zulip_ops/manifests/postgres_common.pp
similarity index 96%
rename from puppet/zulip_internal/manifests/postgres_common.pp
rename to puppet/zulip_ops/manifests/postgres_common.pp
index 302c028e28..2d62a04703 100644
--- a/puppet/zulip_internal/manifests/postgres_common.pp
+++ b/puppet/zulip_ops/manifests/postgres_common.pp
@@ -1,4 +1,4 @@
-class zulip_internal::postgres_common {
+class zulip_ops::postgres_common {
   include zulip::postgres_common
 
   $internal_postgres_packages = [# dependencies for our wal-e backup system
diff --git a/puppet/zulip_internal/manifests/postgres_master.pp b/puppet/zulip_ops/manifests/postgres_master.pp
similarity index 71%
rename from puppet/zulip_internal/manifests/postgres_master.pp
rename to puppet/zulip_ops/manifests/postgres_master.pp
index ccd9aeb4da..0f0f513b82 100644
--- a/puppet/zulip_internal/manifests/postgres_master.pp
+++ b/puppet/zulip_ops/manifests/postgres_master.pp
@@ -1,6 +1,6 @@
-class zulip_internal::postgres_master {
-  include zulip_internal::base
-  include zulip_internal::postgres_appdb
+class zulip_ops::postgres_master {
+  include zulip_ops::base
+  include zulip_ops::postgres_appdb
 
   $master_packages = [# Packages needed for disk + RAID configuration
                       "xfsprogs",
@@ -13,7 +13,7 @@ class zulip_internal::postgres_master {
     owner  => 'root',
     group  => 'root',
     mode   => 644,
-    source   => 'puppet:///modules/zulip_internal/postgresql/40-postgresql.conf.master',
+    source   => 'puppet:///modules/zulip_ops/postgresql/40-postgresql.conf.master',
   }
 
   file { "/etc/postgresql/${zulip::base::postgres_version}/main/postgresql.conf":
@@ -22,7 +22,7 @@ class zulip_internal::postgres_master {
     owner  => "postgres",
     group  => "postgres",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/postgresql/postgresql.conf.master",
+    source => "puppet:///modules/zulip_ops/postgresql/postgresql.conf.master",
   }
 
   file { "/root/setup_disks.sh":
@@ -30,7 +30,7 @@ class zulip_internal::postgres_master {
     owner  => 'root',
     group  => 'root',
     mode   => 744,
-    source => 'puppet:///modules/zulip_internal/postgresql/setup_disks.sh',
+    source => 'puppet:///modules/zulip_ops/postgresql/setup_disks.sh',
   }
 
   exec { "setup_disks":
diff --git a/puppet/zulip_internal/manifests/postgres_slave.pp b/puppet/zulip_ops/manifests/postgres_slave.pp
similarity index 57%
rename from puppet/zulip_internal/manifests/postgres_slave.pp
rename to puppet/zulip_ops/manifests/postgres_slave.pp
index dfd62f6d8d..8a3e8e879b 100644
--- a/puppet/zulip_internal/manifests/postgres_slave.pp
+++ b/puppet/zulip_ops/manifests/postgres_slave.pp
@@ -1,13 +1,13 @@
-class zulip_internal::postgres_slave {
-  include zulip_internal::base
-  include zulip_internal::postgres_appdb
+class zulip_ops::postgres_slave {
+  include zulip_ops::base
+  include zulip_ops::postgres_appdb
 
   file { '/etc/sysctl.d/40-postgresql.conf':
     ensure => file,
     owner  => 'root',
     group  => 'root',
     mode   => 644,
-    source   => 'puppet:///modules/zulip_internal/postgresql/40-postgresql.conf.slave',
+    source   => 'puppet:///modules/zulip_ops/postgresql/40-postgresql.conf.slave',
   }
 
   file { "/etc/postgresql/${zulip::base::postgres_version}/main/postgresql.conf":
@@ -16,6 +16,6 @@ class zulip_internal::postgres_slave {
     owner  => "postgres",
     group  => "postgres",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/postgresql/postgresql.conf.slave",
+    source => "puppet:///modules/zulip_ops/postgresql/postgresql.conf.slave",
   }
 }
diff --git a/puppet/zulip_internal/manifests/prod_app_frontend.pp b/puppet/zulip_ops/manifests/prod_app_frontend.pp
similarity index 74%
rename from puppet/zulip_internal/manifests/prod_app_frontend.pp
rename to puppet/zulip_ops/manifests/prod_app_frontend.pp
index 0c5a9af3a0..f33bcc5d2f 100644
--- a/puppet/zulip_internal/manifests/prod_app_frontend.pp
+++ b/puppet/zulip_ops/manifests/prod_app_frontend.pp
@@ -1,6 +1,6 @@
-class zulip_internal::prod_app_frontend {
-  include zulip_internal::base
-  include zulip_internal::app_frontend
+class zulip_ops::prod_app_frontend {
+  include zulip_ops::base
+  include zulip_ops::app_frontend
 
   file { "/etc/nginx/sites-available/zulip":
     require => Package["nginx-full"],
@@ -8,7 +8,7 @@ class zulip_internal::prod_app_frontend {
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/nginx/sites-available/zulip",
+    source => "puppet:///modules/zulip_ops/nginx/sites-available/zulip",
     notify => Service["nginx"],
   }
   file { '/etc/nginx/sites-enabled/zulip':
@@ -35,7 +35,7 @@ class zulip_internal::prod_app_frontend {
     owner  => "zulip",
     group  => "zulip",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/sparkle/mac/sparkle.xml",
+    source => "puppet:///modules/zulip_ops/sparkle/mac/sparkle.xml",
   }
   file { "/srv/www/dist/apps/mac/sparkle-changelog.html":
     ensure => file,
@@ -43,7 +43,7 @@ class zulip_internal::prod_app_frontend {
     owner  => "zulip",
     group  => "zulip",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/sparkle/mac/sparkle-changelog.html",
+    source => "puppet:///modules/zulip_ops/sparkle/mac/sparkle-changelog.html",
   }
   file { "/srv/www/dist/apps/win/sparkle.xml":
     ensure => file,
@@ -51,7 +51,7 @@ class zulip_internal::prod_app_frontend {
     owner  => "zulip",
     group  => "zulip",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/sparkle/win/sparkle.xml",
+    source => "puppet:///modules/zulip_ops/sparkle/win/sparkle.xml",
   }
   file { "/srv/www/dist/apps/win/sparkle-changelog.html":
     ensure => file,
@@ -59,7 +59,7 @@ class zulip_internal::prod_app_frontend {
     owner  => "zulip",
     group  => "zulip",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/sparkle/win/sparkle-changelog.html",
+    source => "puppet:///modules/zulip_ops/sparkle/win/sparkle-changelog.html",
   }
 
   file { "/srv/www/dist/apps/sso/mac/sparkle.xml":
@@ -68,7 +68,7 @@ class zulip_internal::prod_app_frontend {
     owner  => "zulip",
     group  => "zulip",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/sparkle/sso/mac/sparkle.xml",
+    source => "puppet:///modules/zulip_ops/sparkle/sso/mac/sparkle.xml",
   }
   file { "/srv/www/dist/apps/sso/mac/sparkle-changelog.html":
     ensure => file,
@@ -76,7 +76,7 @@ class zulip_internal::prod_app_frontend {
     owner  => "zulip",
     group  => "zulip",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/sparkle/sso/mac/sparkle-changelog.html",
+    source => "puppet:///modules/zulip_ops/sparkle/sso/mac/sparkle-changelog.html",
   }
   file { "/srv/www/dist/apps/sso/win/sparkle.xml":
     ensure => file,
@@ -84,7 +84,7 @@ class zulip_internal::prod_app_frontend {
     owner  => "zulip",
     group  => "zulip",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/sparkle/sso/win/sparkle.xml",
+    source => "puppet:///modules/zulip_ops/sparkle/sso/win/sparkle.xml",
   }
   file { "/srv/www/dist/apps/sso/win/sparkle-changelog.html":
     ensure => file,
@@ -92,7 +92,7 @@ class zulip_internal::prod_app_frontend {
     owner  => "zulip",
     group  => "zulip",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/sparkle/sso/win/sparkle-changelog.html",
+    source => "puppet:///modules/zulip_ops/sparkle/sso/win/sparkle-changelog.html",
   }
 
   # Prod has our Apple Push Notifications Service private key at
diff --git a/puppet/zulip_ops/manifests/redis.pp b/puppet/zulip_ops/manifests/redis.pp
new file mode 100644
index 0000000000..6c42d70231
--- /dev/null
+++ b/puppet/zulip_ops/manifests/redis.pp
@@ -0,0 +1,7 @@
+class zulip_ops::redis inherits zulip::redis {
+  include zulip_ops::base
+
+  File[ "/etc/redis/redis.conf"] {
+    source => "puppet:///modules/zulip_ops/redis/redis.conf",
+  }
+}
diff --git a/puppet/zulip_internal/manifests/staging_app_frontend.pp b/puppet/zulip_ops/manifests/staging_app_frontend.pp
similarity index 69%
rename from puppet/zulip_internal/manifests/staging_app_frontend.pp
rename to puppet/zulip_ops/manifests/staging_app_frontend.pp
index d3000e272b..90bcc04ed2 100644
--- a/puppet/zulip_internal/manifests/staging_app_frontend.pp
+++ b/puppet/zulip_ops/manifests/staging_app_frontend.pp
@@ -1,6 +1,6 @@
-class zulip_internal::staging_app_frontend {
-  include zulip_internal::base
-  include zulip_internal::app_frontend
+class zulip_ops::staging_app_frontend {
+  include zulip_ops::base
+  include zulip_ops::app_frontend
 
   file { "/etc/nginx/sites-available/zulip-staging":
     require => Package["nginx-full"],
@@ -8,7 +8,7 @@ class zulip_internal::staging_app_frontend {
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/nginx/sites-available/zulip-staging",
+    source => "puppet:///modules/zulip_ops/nginx/sites-available/zulip-staging",
     notify => Service["nginx"],
   }
   file { '/etc/nginx/sites-enabled/zulip-staging':
@@ -22,14 +22,14 @@ class zulip_internal::staging_app_frontend {
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/cron.d/active-user-stats",
+    source => "puppet:///modules/zulip_ops/cron.d/active-user-stats",
   }
   file { "/etc/cron.d/clearsessions":
     ensure => file,
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/cron.d/clearsessions",
+    source => "puppet:///modules/zulip_ops/cron.d/clearsessions",
   }
 
   # Staging has our Apple Push Notifications Service private key at
diff --git a/puppet/zulip_internal/manifests/stats.pp b/puppet/zulip_ops/manifests/stats.pp
similarity index 71%
rename from puppet/zulip_internal/manifests/stats.pp
rename to puppet/zulip_ops/manifests/stats.pp
index d2898de267..4e45a210d4 100644
--- a/puppet/zulip_internal/manifests/stats.pp
+++ b/puppet/zulip_ops/manifests/stats.pp
@@ -1,6 +1,6 @@
-class zulip_internal::stats {
-  include zulip_internal::base
-  include zulip_internal::apache
+class zulip_ops::stats {
+  include zulip_ops::base
+  include zulip_ops::apache
   include zulip::supervisor
 
   $stats_packages = [ "libssl-dev", "zlib1g-dev", "python-twisted", "python-django", "python-django-tagging",
@@ -12,14 +12,14 @@ class zulip_internal::stats {
     owner  => 'root',
     group  => 'root',
     mode   => 744,
-    source => 'puppet:///modules/zulip_internal/graphite/setup_disks.sh',
+    source => 'puppet:///modules/zulip_ops/graphite/setup_disks.sh',
   }
   file { "/etc/cron.d/graphite_backup":
     ensure => file,
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/cron.d/graphite_backup",
+    source => "puppet:///modules/zulip_ops/cron.d/graphite_backup",
   }
   exec { "setup_disks":
     command => "/root/setup_disks.sh",
@@ -32,7 +32,7 @@ class zulip_internal::stats {
     owner  => "root",
     group  => "root",
     mode => 640,
-    source => "puppet:///modules/zulip_internal/certs/stats1.zulip.net.crt",
+    source => "puppet:///modules/zulip_ops/certs/stats1.zulip.net.crt",
   }
 
   file { "/opt/graphite/conf/carbon.conf":
@@ -40,42 +40,42 @@ class zulip_internal::stats {
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/graphite/carbon.conf",
+    source => "puppet:///modules/zulip_ops/graphite/carbon.conf",
   }
   file { "/opt/graphite/conf/aggregation-rules.conf":
     ensure => file,
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/graphite/aggregation-rules.conf",
+    source => "puppet:///modules/zulip_ops/graphite/aggregation-rules.conf",
   }
   file { "/opt/graphite/conf/storage-aggregation.conf":
     ensure => file,
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/graphite/storage-aggregation.conf",
+    source => "puppet:///modules/zulip_ops/graphite/storage-aggregation.conf",
   }
   file { "/opt/graphite/conf/storage-schemas.conf":
     ensure => file,
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/graphite/storage-schemas.conf",
+    source => "puppet:///modules/zulip_ops/graphite/storage-schemas.conf",
   }
   file { "/opt/graphite/webapp/graphite/local_settings.py":
     ensure => file,
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/graphite/local_settings.py",
+    source => "puppet:///modules/zulip_ops/graphite/local_settings.py",
   }
   file { "/opt/graphite/conf/graphite.wsgi":
     ensure => file,
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/graphite/graphite.wsgi",
+    source => "puppet:///modules/zulip_ops/graphite/graphite.wsgi",
   }
 
   file { "/home/zulip/graphiti/config/settings.yml":
@@ -83,7 +83,7 @@ class zulip_internal::stats {
     owner  => "zulip",
     group  => "zulip",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/graphiti/settings.yml",
+    source => "puppet:///modules/zulip_ops/graphiti/settings.yml",
   }
 
   apache2site { 'graphite':
@@ -105,7 +105,7 @@ class zulip_internal::stats {
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/statsd/redis.conf",
+    source => "puppet:///modules/zulip_ops/statsd/redis.conf",
   }
   service { 'redis-server':
     ensure     => running,
@@ -117,6 +117,6 @@ class zulip_internal::stats {
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/supervisor/conf.d/stats.conf",
+    source => "puppet:///modules/zulip_ops/supervisor/conf.d/stats.conf",
   }
 }
diff --git a/puppet/zulip_internal/manifests/trac.pp b/puppet/zulip_ops/manifests/trac.pp
similarity index 76%
rename from puppet/zulip_internal/manifests/trac.pp
rename to puppet/zulip_ops/manifests/trac.pp
index 8d2f2c875c..7e9ea3e30b 100644
--- a/puppet/zulip_internal/manifests/trac.pp
+++ b/puppet/zulip_ops/manifests/trac.pp
@@ -1,7 +1,7 @@
-class zulip_internal::trac {
-  include zulip_internal::base
-  include zulip_internal::apache
-  include zulip_internal::mediawiki
+class zulip_ops::trac {
+  include zulip_ops::base
+  include zulip_ops::apache
+  include zulip_ops::mediawiki
 
   $trac_packages = [# Packages needed to run trac
                     "trac",
@@ -18,7 +18,7 @@ class zulip_internal::trac {
     owner  => "zulip",
     group  => "zulip",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/trac.ini",
+    source => "puppet:///modules/zulip_ops/trac.ini",
     require => User['zulip'],
   }
   file { "/home/zulip/trac/cgi-bin/":
@@ -26,7 +26,7 @@ class zulip_internal::trac {
     owner => "zulip",
     group => "zulip",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/trac/cgi-bin/",
+    source => "puppet:///modules/zulip_ops/trac/cgi-bin/",
   }
   file { '/home/zulip/trac/plugins/zulip_trac.py':
     ensure => 'link',
@@ -43,7 +43,7 @@ class zulip_internal::trac {
     owner  => 'root',
     group  => 'root',
     mode   => 644,
-    source   => 'puppet:///modules/zulip_internal/postgresql/40-postgresql.conf.trac',
+    source   => 'puppet:///modules/zulip_ops/postgresql/40-postgresql.conf.trac',
   }
 
   file { "/etc/postgresql/${zulip::base::postgres_version}/main/postgresql.conf":
@@ -52,6 +52,6 @@ class zulip_internal::trac {
     owner  => "postgres",
     group  => "postgres",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/postgresql/postgresql.conf.trac",
+    source => "puppet:///modules/zulip_ops/postgresql/postgresql.conf.trac",
   }
 }
diff --git a/puppet/zulip_internal/manifests/zmirror.pp b/puppet/zulip_ops/manifests/zmirror.pp
similarity index 83%
rename from puppet/zulip_internal/manifests/zmirror.pp
rename to puppet/zulip_ops/manifests/zmirror.pp
index 2db2e3d3d1..707b436011 100644
--- a/puppet/zulip_internal/manifests/zmirror.pp
+++ b/puppet/zulip_ops/manifests/zmirror.pp
@@ -1,5 +1,5 @@
-class zulip_internal::zmirror {
-  include zulip_internal::base
+class zulip_ops::zmirror {
+  include zulip_ops::base
   include zulip::supervisor
 
   $zmirror_packages = [# Packages needed to run the mirror
@@ -33,7 +33,7 @@ class zulip_internal::zmirror {
     owner => "root",
     group => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/supervisor/conf.d/zmirror.conf",
+    source => "puppet:///modules/zulip_ops/supervisor/conf.d/zmirror.conf",
     notify => Service["supervisor"],
   }
 
@@ -42,7 +42,7 @@ class zulip_internal::zmirror {
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/cron.d/zephyr-mirror",
+    source => "puppet:///modules/zulip_ops/cron.d/zephyr-mirror",
   }
 
   file { "/etc/default/zephyr-clients.debathena":
@@ -50,7 +50,7 @@ class zulip_internal::zmirror {
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/zephyr-clients.debathena",
+    source => "puppet:///modules/zulip_ops/zephyr-clients.debathena",
   }
 
   file { "/usr/lib/nagios/plugins/zulip_zephyr_mirror":
@@ -60,7 +60,7 @@ class zulip_internal::zmirror {
     owner => "root",
     group => "root",
     mode => 755,
-    source => "puppet:///modules/zulip_internal/nagios_plugins/zulip_zephyr_mirror",
+    source => "puppet:///modules/zulip_ops/nagios_plugins/zulip_zephyr_mirror",
   }
 
   # TODO: Do the rest of our setup, which includes at least:
diff --git a/puppet/zulip_internal/manifests/zmirror_personals.pp b/puppet/zulip_ops/manifests/zmirror_personals.pp
similarity index 88%
rename from puppet/zulip_internal/manifests/zmirror_personals.pp
rename to puppet/zulip_ops/manifests/zmirror_personals.pp
index 81dd74782b..1aff4fd09c 100644
--- a/puppet/zulip_internal/manifests/zmirror_personals.pp
+++ b/puppet/zulip_ops/manifests/zmirror_personals.pp
@@ -1,5 +1,5 @@
-class zulip_internal::zmirror_personals {
-  include zulip_internal::base
+class zulip_ops::zmirror_personals {
+  include zulip_ops::base
   include zulip::supervisor
 
   $zmirror_packages = [# Packages needed to run the mirror
@@ -39,7 +39,7 @@ class zulip_internal::zmirror_personals {
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/cron.d/test_zephyr_personal_mirrors",
+    source => "puppet:///modules/zulip_ops/cron.d/test_zephyr_personal_mirrors",
   }
 
   file { "/usr/lib/nagios/plugins/zulip_zephyr_mirror":
@@ -49,7 +49,7 @@ class zulip_internal::zmirror_personals {
     owner => "root",
     group => "root",
     mode => 755,
-    source => "puppet:///modules/zulip_internal/nagios_plugins/zulip_zephyr_mirror",
+    source => "puppet:///modules/zulip_ops/nagios_plugins/zulip_zephyr_mirror",
   }
 
   # TODO: Do the rest of our setup, which includes at least:
diff --git a/puppet/zulip_internal/templates/iptables/rules.v4.erb b/puppet/zulip_ops/templates/iptables/rules.v4.erb
similarity index 100%
rename from puppet/zulip_internal/templates/iptables/rules.v4.erb
rename to puppet/zulip_ops/templates/iptables/rules.v4.erb
diff --git a/puppet/zulip_internal/templates/munin/munin.conf.erb b/puppet/zulip_ops/templates/munin/munin.conf.erb
similarity index 100%
rename from puppet/zulip_internal/templates/munin/munin.conf.erb
rename to puppet/zulip_ops/templates/munin/munin.conf.erb
diff --git a/puppet/zulip_internal/templates/supervisor/conf.d/munin_tunnels.conf.erb b/puppet/zulip_ops/templates/supervisor/conf.d/munin_tunnels.conf.erb
similarity index 100%
rename from puppet/zulip_internal/templates/supervisor/conf.d/munin_tunnels.conf.erb
rename to puppet/zulip_ops/templates/supervisor/conf.d/munin_tunnels.conf.erb
diff --git a/tools/run-mypy b/tools/run-mypy
index 8d33b65106..e2dd712e47 100755
--- a/tools/run-mypy
+++ b/tools/run-mypy
@@ -41,7 +41,7 @@ bots/gcal-bot
 bots/githook-post-receive
 bots/jabber_mirror_backend.py
 bots/zephyr_mirror_backend.py
-puppet/zulip_internal
+puppet/zulip_ops
 tools/deprecated/generate-activity-metrics.py
 tools/deprecated/inject-messages/inject-messages
 zproject/settings.py