diff --git a/universal/files/clean-logs.sh b/common/files/clean-logs.sh
similarity index 100%
rename from universal/files/clean-logs.sh
rename to common/files/clean-logs.sh
diff --git a/universal/files/persistent-listener.sh b/common/files/persistent-listener.sh
similarity index 100%
rename from universal/files/persistent-listener.sh
rename to common/files/persistent-listener.sh
diff --git a/universal/files/randomize_ports.sh b/common/files/randomize_ports.sh
similarity index 100%
rename from universal/files/randomize_ports.sh
rename to common/files/randomize_ports.sh
diff --git a/universal/files/rubber-ducky.txt b/common/files/rubber-ducky.txt
similarity index 100%
rename from universal/files/rubber-ducky.txt
rename to common/files/rubber-ducky.txt
diff --git a/universal/files/secure-exit.sh b/common/files/secure-exit.sh
similarity index 100%
rename from universal/files/secure-exit.sh
rename to common/files/secure-exit.sh
diff --git a/universal/tasks/cleanup_confirmation.yml b/common/tasks/cleanup_confirmation.yml
similarity index 100%
rename from universal/tasks/cleanup_confirmation.yml
rename to common/tasks/cleanup_confirmation.yml
diff --git a/universal/tasks/configure_mail.yml b/common/tasks/configure_mail.yml
similarity index 100%
rename from universal/tasks/configure_mail.yml
rename to common/tasks/configure_mail.yml
diff --git a/universal/tasks/initial-infrastructure.yml b/common/tasks/initial-infrastructure.yml
similarity index 100%
rename from universal/tasks/initial-infrastructure.yml
rename to common/tasks/initial-infrastructure.yml
diff --git a/universal/tasks/install_tools.yml b/common/tasks/install_tools.yml
similarity index 100%
rename from universal/tasks/install_tools.yml
rename to common/tasks/install_tools.yml
diff --git a/universal/tasks/port_randomization.yml b/common/tasks/port_randomization.yml
similarity index 100%
rename from universal/tasks/port_randomization.yml
rename to common/tasks/port_randomization.yml
diff --git a/universal/tasks/security_hardening.yml b/common/tasks/security_hardening.yml
similarity index 100%
rename from universal/tasks/security_hardening.yml
rename to common/tasks/security_hardening.yml
diff --git a/universal/tasks/traffic_flow_config.yml b/common/tasks/traffic_flow_config.yml
similarity index 100%
rename from universal/tasks/traffic_flow_config.yml
rename to common/tasks/traffic_flow_config.yml
diff --git a/universal/templates/POST_INSTALL_INSTRUCTIONS.txt.j2 b/common/templates/POST_INSTALL_INSTRUCTIONS.txt.j2
similarity index 100%
rename from universal/templates/POST_INSTALL_INSTRUCTIONS.txt.j2
rename to common/templates/POST_INSTALL_INSTRUCTIONS.txt.j2
diff --git a/universal/templates/default-site.j2 b/common/templates/default-site.j2
similarity index 100%
rename from universal/templates/default-site.j2
rename to common/templates/default-site.j2
diff --git a/universal/templates/index.html.j2 b/common/templates/index.html.j2
similarity index 100%
rename from universal/templates/index.html.j2
rename to common/templates/index.html.j2
diff --git a/universal/templates/infrastructure_state.j2 b/common/templates/infrastructure_state.j2
similarity index 100%
rename from universal/templates/infrastructure_state.j2
rename to common/templates/infrastructure_state.j2
diff --git a/universal/templates/linux_loader.sh.j2 b/common/templates/linux_loader.sh.j2
similarity index 100%
rename from universal/templates/linux_loader.sh.j2
rename to common/templates/linux_loader.sh.j2
diff --git a/universal/templates/manifest.json.j2 b/common/templates/manifest.json.j2
similarity index 100%
rename from universal/templates/manifest.json.j2
rename to common/templates/manifest.json.j2
diff --git a/universal/templates/motd-aws.j2 b/common/templates/motd-aws.j2
similarity index 100%
rename from universal/templates/motd-aws.j2
rename to common/templates/motd-aws.j2
diff --git a/universal/templates/motd-linode.j2 b/common/templates/motd-linode.j2
similarity index 100%
rename from universal/templates/motd-linode.j2
rename to common/templates/motd-linode.j2
diff --git a/universal/templates/motd-redirector.j2 b/common/templates/motd-redirector.j2
similarity index 100%
rename from universal/templates/motd-redirector.j2
rename to common/templates/motd-redirector.j2
diff --git a/universal/templates/motd.j2 b/common/templates/motd.j2
similarity index 100%
rename from universal/templates/motd.j2
rename to common/templates/motd.j2
diff --git a/universal/templates/proxychains.conf.j2 b/common/templates/proxychains.conf.j2
similarity index 100%
rename from universal/templates/proxychains.conf.j2
rename to common/templates/proxychains.conf.j2
diff --git a/universal/templates/reference.txt.j2 b/common/templates/reference.txt.j2
similarity index 100%
rename from universal/templates/reference.txt.j2
rename to common/templates/reference.txt.j2
diff --git a/universal/templates/resolv.conf.j2 b/common/templates/resolv.conf.j2
similarity index 100%
rename from universal/templates/resolv.conf.j2
rename to common/templates/resolv.conf.j2
diff --git a/universal/templates/secure-ssh.sh.j2 b/common/templates/secure-ssh.sh.j2
similarity index 100%
rename from universal/templates/secure-ssh.sh.j2
rename to common/templates/secure-ssh.sh.j2
diff --git a/universal/templates/setup-cert.sh.j2 b/common/templates/setup-cert.sh.j2
similarity index 100%
rename from universal/templates/setup-cert.sh.j2
rename to common/templates/setup-cert.sh.j2
diff --git a/universal/templates/shell-handler.service.j2 b/common/templates/shell-handler.service.j2
similarity index 100%
rename from universal/templates/shell-handler.service.j2
rename to common/templates/shell-handler.service.j2
diff --git a/universal/templates/torrc.j2 b/common/templates/torrc.j2
similarity index 100%
rename from universal/templates/torrc.j2
rename to common/templates/torrc.j2
diff --git a/universal/templates/windows_loader.ps1.j2 b/common/templates/windows_loader.ps1.j2
similarity index 100%
rename from universal/templates/windows_loader.ps1.j2
rename to common/templates/windows_loader.ps1.j2
diff --git a/universal/files/havoc_installer.sh b/modules/c2/files/havoc_installer.sh
similarity index 100%
rename from universal/files/havoc_installer.sh
rename to modules/c2/files/havoc_installer.sh
diff --git a/universal/files/havoc_mutate.sh b/modules/c2/files/havoc_mutate.sh
similarity index 100%
rename from universal/files/havoc_mutate.sh
rename to modules/c2/files/havoc_mutate.sh
diff --git a/universal/files/havoc_shell_handler.sh b/modules/c2/files/havoc_shell_handler.sh
similarity index 100%
rename from universal/files/havoc_shell_handler.sh
rename to modules/c2/files/havoc_shell_handler.sh
diff --git a/universal/files/implant_mutator.sh b/modules/c2/files/implant_mutator.sh
similarity index 100%
rename from universal/files/implant_mutator.sh
rename to modules/c2/files/implant_mutator.sh
diff --git a/universal/files/post_install_c2.sh b/modules/c2/files/post_install_c2.sh
similarity index 100%
rename from universal/files/post_install_c2.sh
rename to modules/c2/files/post_install_c2.sh
diff --git a/universal/tasks/configure_advanced_evasion.yml b/modules/c2/tasks/configure_advanced_evasion.yml
similarity index 100%
rename from universal/tasks/configure_advanced_evasion.yml
rename to modules/c2/tasks/configure_advanced_evasion.yml
diff --git a/universal/tasks/configure_c2.yml b/modules/c2/tasks/configure_c2.yml
similarity index 100%
rename from universal/tasks/configure_c2.yml
rename to modules/c2/tasks/configure_c2.yml
diff --git a/universal/tasks/configure_integrated_tracker.yml b/modules/c2/tasks/configure_integrated_tracker.yml
similarity index 100%
rename from universal/tasks/configure_integrated_tracker.yml
rename to modules/c2/tasks/configure_integrated_tracker.yml
diff --git a/c2/templates/generate_evasive_beacons.sh.j2 b/modules/c2/templates/generate_evasive_beacons.sh.j2
similarity index 100%
rename from c2/templates/generate_evasive_beacons.sh.j2
rename to modules/c2/templates/generate_evasive_beacons.sh.j2
diff --git a/c2/templates/generate_havoc_payloads.sh.j2 b/modules/c2/templates/generate_havoc_payloads.sh.j2
similarity index 100%
rename from c2/templates/generate_havoc_payloads.sh.j2
rename to modules/c2/templates/generate_havoc_payloads.sh.j2
diff --git a/c2/templates/havoc-config.yaotl.j2 b/modules/c2/templates/havoc-config.yaotl.j2
similarity index 100%
rename from c2/templates/havoc-config.yaotl.j2
rename to modules/c2/templates/havoc-config.yaotl.j2
diff --git a/c2/templates/havoc-guide.j2 b/modules/c2/templates/havoc-guide.j2
similarity index 100%
rename from c2/templates/havoc-guide.j2
rename to modules/c2/templates/havoc-guide.j2
diff --git a/universal/templates/serve-havoc-payloads.sh.j2 b/modules/c2/templates/serve-havoc-payloads.sh.j2
similarity index 100%
rename from universal/templates/serve-havoc-payloads.sh.j2
rename to modules/c2/templates/serve-havoc-payloads.sh.j2
diff --git a/universal/files/secure_payload_sync.sh b/modules/payload-server/files/secure_payload_sync.sh
similarity index 100%
rename from universal/files/secure_payload_sync.sh
rename to modules/payload-server/files/secure_payload_sync.sh
diff --git a/payload-server/payload_redirector.yml b/modules/payload-server/payload_redirector.yml
similarity index 100%
rename from payload-server/payload_redirector.yml
rename to modules/payload-server/payload_redirector.yml
diff --git a/payload-server/payload_server.yml b/modules/payload-server/payload_server.yml
similarity index 100%
rename from payload-server/payload_server.yml
rename to modules/payload-server/payload_server.yml
diff --git a/universal/tasks/configure_payload_redirector.yml b/modules/payload-server/tasks/configure_payload_redirector.yml
similarity index 100%
rename from universal/tasks/configure_payload_redirector.yml
rename to modules/payload-server/tasks/configure_payload_redirector.yml
diff --git a/universal/tasks/configure_payload_server.yml b/modules/payload-server/tasks/configure_payload_server.yml
similarity index 100%
rename from universal/tasks/configure_payload_server.yml
rename to modules/payload-server/tasks/configure_payload_server.yml
diff --git a/phishing/Plan.md b/modules/phishing/Plan.md
similarity index 100%
rename from phishing/Plan.md
rename to modules/phishing/Plan.md
diff --git a/phishing/cleanup_phishing.yml b/modules/phishing/cleanup_phishing.yml
similarity index 100%
rename from phishing/cleanup_phishing.yml
rename to modules/phishing/cleanup_phishing.yml
diff --git a/phishing/deploy_phishing_infrastructure.yml b/modules/phishing/deploy_phishing_infrastructure.yml
similarity index 100%
rename from phishing/deploy_phishing_infrastructure.yml
rename to modules/phishing/deploy_phishing_infrastructure.yml
diff --git a/universal/tasks/configure_gophish_advanced.yml b/modules/phishing/gophish/tasks/configure_gophish_advanced.yml
similarity index 100%
rename from universal/tasks/configure_gophish_advanced.yml
rename to modules/phishing/gophish/tasks/configure_gophish_advanced.yml
diff --git a/universal/tasks/configure_phishing_server.yml b/modules/phishing/gophish/tasks/configure_phishing_server.yml
similarity index 100%
rename from universal/tasks/configure_phishing_server.yml
rename to modules/phishing/gophish/tasks/configure_phishing_server.yml
diff --git a/phishing/templates/gophish-advanced-config.j2 b/modules/phishing/gophish/templates/gophish-advanced-config.j2
similarity index 100%
rename from phishing/templates/gophish-advanced-config.j2
rename to modules/phishing/gophish/templates/gophish-advanced-config.j2
diff --git a/phishing/templates/gophish-config.j2 b/modules/phishing/gophish/templates/gophish-config.j2
similarity index 100%
rename from phishing/templates/gophish-config.j2
rename to modules/phishing/gophish/templates/gophish-config.j2
diff --git a/phishing/gophish_server.yml b/modules/phishing/gophish_server.yml
similarity index 100%
rename from phishing/gophish_server.yml
rename to modules/phishing/gophish_server.yml
diff --git a/universal/tasks/configure_mta_front.yml b/modules/phishing/mta-front/tasks/configure_mta_front.yml
similarity index 100%
rename from universal/tasks/configure_mta_front.yml
rename to modules/phishing/mta-front/tasks/configure_mta_front.yml
diff --git a/phishing/templates/postfix-mta-front.j2 b/modules/phishing/mta-front/templates/postfix-mta-front.j2
similarity index 100%
rename from phishing/templates/postfix-mta-front.j2
rename to modules/phishing/mta-front/templates/postfix-mta-front.j2
diff --git a/phishing/mta_front.yml b/modules/phishing/mta_front.yml
similarity index 100%
rename from phishing/mta_front.yml
rename to modules/phishing/mta_front.yml
diff --git a/phishing/phishing_redirector.yml b/modules/phishing/phishing_redirector.yml
similarity index 100%
rename from phishing/phishing_redirector.yml
rename to modules/phishing/phishing_redirector.yml
diff --git a/phishing/phishing_webserver.yml b/modules/phishing/phishing_webserver.yml
similarity index 100%
rename from phishing/phishing_webserver.yml
rename to modules/phishing/phishing_webserver.yml
diff --git a/universal/tasks/configure_fedramp_compliance.yml b/modules/phishing/tasks/configure_fedramp_compliance.yml
similarity index 100%
rename from universal/tasks/configure_fedramp_compliance.yml
rename to modules/phishing/tasks/configure_fedramp_compliance.yml
diff --git a/phishing/templates/email-templates/file_share.j2 b/modules/phishing/templates/email-templates/file_share.j2
similarity index 100%
rename from phishing/templates/email-templates/file_share.j2
rename to modules/phishing/templates/email-templates/file_share.j2
diff --git a/phishing/templates/email-templates/office365_login.j2 b/modules/phishing/templates/email-templates/office365_login.j2
similarity index 100%
rename from phishing/templates/email-templates/office365_login.j2
rename to modules/phishing/templates/email-templates/office365_login.j2
diff --git a/phishing/templates/email-templates/password_expiry.j2 b/modules/phishing/templates/email-templates/password_expiry.j2
similarity index 100%
rename from phishing/templates/email-templates/password_expiry.j2
rename to modules/phishing/templates/email-templates/password_expiry.j2
diff --git a/phishing/templates/email-templates/security_alert.j2 b/modules/phishing/templates/email-templates/security_alert.j2
similarity index 100%
rename from phishing/templates/email-templates/security_alert.j2
rename to modules/phishing/templates/email-templates/security_alert.j2
diff --git a/phishing/templates/fedramp-compliance.j2 b/modules/phishing/templates/fedramp-compliance.j2
similarity index 100%
rename from phishing/templates/fedramp-compliance.j2
rename to modules/phishing/templates/fedramp-compliance.j2
diff --git a/phishing/templates/phishing_deployment_state.j2 b/modules/phishing/templates/phishing_deployment_state.j2
similarity index 100%
rename from phishing/templates/phishing_deployment_state.j2
rename to modules/phishing/templates/phishing_deployment_state.j2
diff --git a/universal/tasks/configure_phishing_webserver.yml b/modules/phishing/webserver/tasks/configure_phishing_webserver.yml
similarity index 100%
rename from universal/tasks/configure_phishing_webserver.yml
rename to modules/phishing/webserver/tasks/configure_phishing_webserver.yml
diff --git a/universal/tasks/setup_phishing_security.yml b/modules/phishing/webserver/tasks/setup_phishing_security.yml
similarity index 100%
rename from universal/tasks/setup_phishing_security.yml
rename to modules/phishing/webserver/tasks/setup_phishing_security.yml
diff --git a/phishing/templates/nginx-phishing-webserver.j2 b/modules/phishing/webserver/templates/nginx-phishing-webserver.j2
similarity index 100%
rename from phishing/templates/nginx-phishing-webserver.j2
rename to modules/phishing/webserver/templates/nginx-phishing-webserver.j2
diff --git a/modules/phishing/webserver/templates/page-templates/AmazonClone/amazon_logo.png b/modules/phishing/webserver/templates/page-templates/AmazonClone/amazon_logo.png
new file mode 100644
index 0000000..320210e
Binary files /dev/null and b/modules/phishing/webserver/templates/page-templates/AmazonClone/amazon_logo.png differ
diff --git a/modules/phishing/webserver/templates/page-templates/AmazonClone/box10_image.jpg b/modules/phishing/webserver/templates/page-templates/AmazonClone/box10_image.jpg
new file mode 100644
index 0000000..816b8c7
Binary files /dev/null and b/modules/phishing/webserver/templates/page-templates/AmazonClone/box10_image.jpg differ
diff --git a/modules/phishing/webserver/templates/page-templates/AmazonClone/box11_image.jpg b/modules/phishing/webserver/templates/page-templates/AmazonClone/box11_image.jpg
new file mode 100644
index 0000000..a7b3d3e
Binary files /dev/null and b/modules/phishing/webserver/templates/page-templates/AmazonClone/box11_image.jpg differ
diff --git a/modules/phishing/webserver/templates/page-templates/AmazonClone/box12_image.jpg b/modules/phishing/webserver/templates/page-templates/AmazonClone/box12_image.jpg
new file mode 100644
index 0000000..88d62fa
Binary files /dev/null and b/modules/phishing/webserver/templates/page-templates/AmazonClone/box12_image.jpg differ
diff --git a/modules/phishing/webserver/templates/page-templates/AmazonClone/box1_image.jpg b/modules/phishing/webserver/templates/page-templates/AmazonClone/box1_image.jpg
new file mode 100644
index 0000000..f4aa14e
Binary files /dev/null and b/modules/phishing/webserver/templates/page-templates/AmazonClone/box1_image.jpg differ
diff --git a/modules/phishing/webserver/templates/page-templates/AmazonClone/box2_image.jpg b/modules/phishing/webserver/templates/page-templates/AmazonClone/box2_image.jpg
new file mode 100644
index 0000000..d807dc4
Binary files /dev/null and b/modules/phishing/webserver/templates/page-templates/AmazonClone/box2_image.jpg differ
diff --git a/modules/phishing/webserver/templates/page-templates/AmazonClone/box3_image.jpg b/modules/phishing/webserver/templates/page-templates/AmazonClone/box3_image.jpg
new file mode 100644
index 0000000..300f1f3
Binary files /dev/null and b/modules/phishing/webserver/templates/page-templates/AmazonClone/box3_image.jpg differ
diff --git a/modules/phishing/webserver/templates/page-templates/AmazonClone/box4_image.jpg b/modules/phishing/webserver/templates/page-templates/AmazonClone/box4_image.jpg
new file mode 100644
index 0000000..90ee126
Binary files /dev/null and b/modules/phishing/webserver/templates/page-templates/AmazonClone/box4_image.jpg differ
diff --git a/modules/phishing/webserver/templates/page-templates/AmazonClone/box5_image.jpg b/modules/phishing/webserver/templates/page-templates/AmazonClone/box5_image.jpg
new file mode 100644
index 0000000..4fe84c4
Binary files /dev/null and b/modules/phishing/webserver/templates/page-templates/AmazonClone/box5_image.jpg differ
diff --git a/modules/phishing/webserver/templates/page-templates/AmazonClone/box6_image.jpg b/modules/phishing/webserver/templates/page-templates/AmazonClone/box6_image.jpg
new file mode 100644
index 0000000..ca7f184
Binary files /dev/null and b/modules/phishing/webserver/templates/page-templates/AmazonClone/box6_image.jpg differ
diff --git a/modules/phishing/webserver/templates/page-templates/AmazonClone/box7_image.jpg b/modules/phishing/webserver/templates/page-templates/AmazonClone/box7_image.jpg
new file mode 100644
index 0000000..21c2373
Binary files /dev/null and b/modules/phishing/webserver/templates/page-templates/AmazonClone/box7_image.jpg differ
diff --git a/modules/phishing/webserver/templates/page-templates/AmazonClone/box8_image.jpg b/modules/phishing/webserver/templates/page-templates/AmazonClone/box8_image.jpg
new file mode 100644
index 0000000..2312740
Binary files /dev/null and b/modules/phishing/webserver/templates/page-templates/AmazonClone/box8_image.jpg differ
diff --git a/modules/phishing/webserver/templates/page-templates/AmazonClone/box9_image.jpg b/modules/phishing/webserver/templates/page-templates/AmazonClone/box9_image.jpg
new file mode 100644
index 0000000..252cd92
Binary files /dev/null and b/modules/phishing/webserver/templates/page-templates/AmazonClone/box9_image.jpg differ
diff --git a/modules/phishing/webserver/templates/page-templates/AmazonClone/hero1_image.jpg b/modules/phishing/webserver/templates/page-templates/AmazonClone/hero1_image.jpg
new file mode 100644
index 0000000..8db0992
Binary files /dev/null and b/modules/phishing/webserver/templates/page-templates/AmazonClone/hero1_image.jpg differ
diff --git a/modules/phishing/webserver/templates/page-templates/AmazonClone/index.html b/modules/phishing/webserver/templates/page-templates/AmazonClone/index.html
new file mode 100644
index 0000000..b6e532f
--- /dev/null
+++ b/modules/phishing/webserver/templates/page-templates/AmazonClone/index.html
@@ -0,0 +1,238 @@
+
+
+
+
+
+ Amazon
+
+
+
+
+
+
+
+
+
+
+
+
Deliver to
+
+
+
US
+
+
+
+
+
+
+
+
+
+
+
+
+
Hello, sign in
+
Accounts & Lists
+
+
+
+
Returns
+
& Orders
+
+
+
+
+ Cart
+
+
+
+
+
+
+ All
+
+
+
+
Today's Deals
+
Buy Again
+
Customer Service
+
Registry
+
Gift Cards
+
Sell
+
+
+
+
+
+
+
You are on amazon.com. You can also shop on Amazon for millions of products with fast local delivery. Click here to go to amazon.in