diff --git a/add_new_user_in_microsoft_office_365/README.md b/access_management/add_new_user_in_microsoft_office_365/README.md
similarity index 100%
rename from add_new_user_in_microsoft_office_365/README.md
rename to access_management/add_new_user_in_microsoft_office_365/README.md
diff --git a/add_new_user_in_microsoft_office_365/add_new_user_in_microsoft_office_365.fp b/access_management/add_new_user_in_microsoft_office_365/add_new_user_in_microsoft_office_365.fp
similarity index 100%
rename from add_new_user_in_microsoft_office_365/add_new_user_in_microsoft_office_365.fp
rename to access_management/add_new_user_in_microsoft_office_365/add_new_user_in_microsoft_office_365.fp
diff --git a/add_new_user_in_microsoft_office_365/flowpipe.fpvars.example b/access_management/add_new_user_in_microsoft_office_365/flowpipe.fpvars.example
similarity index 100%
rename from add_new_user_in_microsoft_office_365/flowpipe.fpvars.example
rename to access_management/add_new_user_in_microsoft_office_365/flowpipe.fpvars.example
diff --git a/add_new_user_in_microsoft_office_365/mod.fp b/access_management/add_new_user_in_microsoft_office_365/mod.fp
similarity index 100%
rename from add_new_user_in_microsoft_office_365/mod.fp
rename to access_management/add_new_user_in_microsoft_office_365/mod.fp
diff --git a/add_new_user_in_microsoft_office_365/variables.fp b/access_management/add_new_user_in_microsoft_office_365/variables.fp
similarity index 100%
rename from add_new_user_in_microsoft_office_365/variables.fp
rename to access_management/add_new_user_in_microsoft_office_365/variables.fp
diff --git a/add_pipes_org_workspace_invite_members/README.md b/access_management/add_pipes_org_workspace_invite_members/README.md
similarity index 100%
rename from add_pipes_org_workspace_invite_members/README.md
rename to access_management/add_pipes_org_workspace_invite_members/README.md
diff --git a/add_pipes_org_workspace_invite_members/add_pipes_org_workspace_and_members.fp b/access_management/add_pipes_org_workspace_invite_members/add_pipes_org_workspace_and_members.fp
similarity index 100%
rename from add_pipes_org_workspace_invite_members/add_pipes_org_workspace_and_members.fp
rename to access_management/add_pipes_org_workspace_invite_members/add_pipes_org_workspace_and_members.fp
diff --git a/add_pipes_org_workspace_invite_members/invite_organization_member_by_email.fp b/access_management/add_pipes_org_workspace_invite_members/invite_organization_member_by_email.fp
similarity index 100%
rename from add_pipes_org_workspace_invite_members/invite_organization_member_by_email.fp
rename to access_management/add_pipes_org_workspace_invite_members/invite_organization_member_by_email.fp
diff --git a/add_pipes_org_workspace_invite_members/mod.fp b/access_management/add_pipes_org_workspace_invite_members/mod.fp
similarity index 100%
rename from add_pipes_org_workspace_invite_members/mod.fp
rename to access_management/add_pipes_org_workspace_invite_members/mod.fp
diff --git a/create_okta_user_assign_to_group/README.md b/access_management/create_okta_user_assign_to_group/README.md
similarity index 100%
rename from create_okta_user_assign_to_group/README.md
rename to access_management/create_okta_user_assign_to_group/README.md
diff --git a/create_okta_user_assign_to_group/create_okta_user_assign_to_group.fp b/access_management/create_okta_user_assign_to_group/create_okta_user_assign_to_group.fp
similarity index 100%
rename from create_okta_user_assign_to_group/create_okta_user_assign_to_group.fp
rename to access_management/create_okta_user_assign_to_group/create_okta_user_assign_to_group.fp
diff --git a/create_okta_user_assign_to_group/flowpipe.fpvars.example b/access_management/create_okta_user_assign_to_group/flowpipe.fpvars.example
similarity index 100%
rename from create_okta_user_assign_to_group/flowpipe.fpvars.example
rename to access_management/create_okta_user_assign_to_group/flowpipe.fpvars.example
diff --git a/create_okta_user_assign_to_group/mod.fp b/access_management/create_okta_user_assign_to_group/mod.fp
similarity index 100%
rename from create_okta_user_assign_to_group/mod.fp
rename to access_management/create_okta_user_assign_to_group/mod.fp
diff --git a/create_okta_user_assign_to_group/variables.fp b/access_management/create_okta_user_assign_to_group/variables.fp
similarity index 100%
rename from create_okta_user_assign_to_group/variables.fp
rename to access_management/create_okta_user_assign_to_group/variables.fp
diff --git a/report_inactive_okta_accounts/README.md b/access_management/report_inactive_okta_accounts/README.md
similarity index 100%
rename from report_inactive_okta_accounts/README.md
rename to access_management/report_inactive_okta_accounts/README.md
diff --git a/report_inactive_okta_accounts/mod.fp b/access_management/report_inactive_okta_accounts/mod.fp
similarity index 100%
rename from report_inactive_okta_accounts/mod.fp
rename to access_management/report_inactive_okta_accounts/mod.fp
diff --git a/report_inactive_okta_accounts/report_inactive_okta_accounts.fp b/access_management/report_inactive_okta_accounts/report_inactive_okta_accounts.fp
similarity index 100%
rename from report_inactive_okta_accounts/report_inactive_okta_accounts.fp
rename to access_management/report_inactive_okta_accounts/report_inactive_okta_accounts.fp
diff --git a/summarize_github_issue_with_openai/README.md b/ai/summarize_github_issue_with_openai/README.md
similarity index 100%
rename from summarize_github_issue_with_openai/README.md
rename to ai/summarize_github_issue_with_openai/README.md
diff --git a/summarize_github_issue_with_openai/flowpipe.fpvars.example b/ai/summarize_github_issue_with_openai/flowpipe.fpvars.example
similarity index 100%
rename from summarize_github_issue_with_openai/flowpipe.fpvars.example
rename to ai/summarize_github_issue_with_openai/flowpipe.fpvars.example
diff --git a/summarize_github_issue_with_openai/mod.fp b/ai/summarize_github_issue_with_openai/mod.fp
similarity index 100%
rename from summarize_github_issue_with_openai/mod.fp
rename to ai/summarize_github_issue_with_openai/mod.fp
diff --git a/summarize_github_issue_with_openai/summarize_github_issue_with_openai.fp b/ai/summarize_github_issue_with_openai/summarize_github_issue_with_openai.fp
similarity index 100%
rename from summarize_github_issue_with_openai/summarize_github_issue_with_openai.fp
rename to ai/summarize_github_issue_with_openai/summarize_github_issue_with_openai.fp
diff --git a/summarize_github_issue_with_openai/variables.fp b/ai/summarize_github_issue_with_openai/variables.fp
similarity index 100%
rename from summarize_github_issue_with_openai/variables.fp
rename to ai/summarize_github_issue_with_openai/variables.fp
diff --git a/delete_mail_from_microsoft_office_365/README.md b/data_management/delete_mail_from_microsoft_office_365/README.md
similarity index 100%
rename from delete_mail_from_microsoft_office_365/README.md
rename to data_management/delete_mail_from_microsoft_office_365/README.md
diff --git a/delete_mail_from_microsoft_office_365/delete_mail_from_microsoft_office_365.fp b/data_management/delete_mail_from_microsoft_office_365/delete_mail_from_microsoft_office_365.fp
similarity index 100%
rename from delete_mail_from_microsoft_office_365/delete_mail_from_microsoft_office_365.fp
rename to data_management/delete_mail_from_microsoft_office_365/delete_mail_from_microsoft_office_365.fp
diff --git a/delete_mail_from_microsoft_office_365/mod.fp b/data_management/delete_mail_from_microsoft_office_365/mod.fp
similarity index 100%
rename from delete_mail_from_microsoft_office_365/mod.fp
rename to data_management/delete_mail_from_microsoft_office_365/mod.fp
diff --git a/notify_on_call_engineer_with_pagerduty/README.md b/incident_response/notify_on_call_engineer_with_pagerduty/README.md
similarity index 100%
rename from notify_on_call_engineer_with_pagerduty/README.md
rename to incident_response/notify_on_call_engineer_with_pagerduty/README.md
diff --git a/notify_on_call_engineer_with_pagerduty/mod.fp b/incident_response/notify_on_call_engineer_with_pagerduty/mod.fp
similarity index 100%
rename from notify_on_call_engineer_with_pagerduty/mod.fp
rename to incident_response/notify_on_call_engineer_with_pagerduty/mod.fp
diff --git a/notify_on_call_engineer_with_pagerduty/notify_on_call_engineer_with_pagerduty.fp b/incident_response/notify_on_call_engineer_with_pagerduty/notify_on_call_engineer_with_pagerduty.fp
similarity index 100%
rename from notify_on_call_engineer_with_pagerduty/notify_on_call_engineer_with_pagerduty.fp
rename to incident_response/notify_on_call_engineer_with_pagerduty/notify_on_call_engineer_with_pagerduty.fp
diff --git a/remediate_pagerduty_alert/README.md b/incident_response/remediate_pagerduty_alert/README.md
similarity index 100%
rename from remediate_pagerduty_alert/README.md
rename to incident_response/remediate_pagerduty_alert/README.md
diff --git a/remediate_pagerduty_alert/mod.fp b/incident_response/remediate_pagerduty_alert/mod.fp
similarity index 100%
rename from remediate_pagerduty_alert/mod.fp
rename to incident_response/remediate_pagerduty_alert/mod.fp
diff --git a/remediate_pagerduty_alert/pagerduty_incident_acknowledged.fp b/incident_response/remediate_pagerduty_alert/pagerduty_incident_acknowledged.fp
similarity index 100%
rename from remediate_pagerduty_alert/pagerduty_incident_acknowledged.fp
rename to incident_response/remediate_pagerduty_alert/pagerduty_incident_acknowledged.fp
diff --git a/remediate_pagerduty_alert/pagerduty_incident_annotated.fp b/incident_response/remediate_pagerduty_alert/pagerduty_incident_annotated.fp
similarity index 100%
rename from remediate_pagerduty_alert/pagerduty_incident_annotated.fp
rename to incident_response/remediate_pagerduty_alert/pagerduty_incident_annotated.fp
diff --git a/remediate_pagerduty_alert/pagerduty_incident_triggered.fp b/incident_response/remediate_pagerduty_alert/pagerduty_incident_triggered.fp
similarity index 100%
rename from remediate_pagerduty_alert/pagerduty_incident_triggered.fp
rename to incident_response/remediate_pagerduty_alert/pagerduty_incident_triggered.fp
diff --git a/remediate_pagerduty_alert/remediate_pagerduty_alert.fp b/incident_response/remediate_pagerduty_alert/remediate_pagerduty_alert.fp
similarity index 100%
rename from remediate_pagerduty_alert/remediate_pagerduty_alert.fp
rename to incident_response/remediate_pagerduty_alert/remediate_pagerduty_alert.fp
diff --git a/simple/send_discord_message/README.md b/messaging/send_discord_message/README.md
similarity index 100%
rename from simple/send_discord_message/README.md
rename to messaging/send_discord_message/README.md
diff --git a/simple/send_discord_message/locals.fp b/messaging/send_discord_message/locals.fp
similarity index 100%
rename from simple/send_discord_message/locals.fp
rename to messaging/send_discord_message/locals.fp
diff --git a/simple/send_discord_message/mod.fp b/messaging/send_discord_message/mod.fp
similarity index 100%
rename from simple/send_discord_message/mod.fp
rename to messaging/send_discord_message/mod.fp
diff --git a/simple/send_discord_message/send_discord_message.fp b/messaging/send_discord_message/send_discord_message.fp
similarity index 100%
rename from simple/send_discord_message/send_discord_message.fp
rename to messaging/send_discord_message/send_discord_message.fp
diff --git a/send_message_to_user_in_microsoft_teams/README.md b/messaging/send_message_to_user_in_microsoft_teams/README.md
similarity index 100%
rename from send_message_to_user_in_microsoft_teams/README.md
rename to messaging/send_message_to_user_in_microsoft_teams/README.md
diff --git a/send_message_to_user_in_microsoft_teams/flowpipe.fpvars.example b/messaging/send_message_to_user_in_microsoft_teams/flowpipe.fpvars.example
similarity index 100%
rename from send_message_to_user_in_microsoft_teams/flowpipe.fpvars.example
rename to messaging/send_message_to_user_in_microsoft_teams/flowpipe.fpvars.example
diff --git a/send_message_to_user_in_microsoft_teams/mod.fp b/messaging/send_message_to_user_in_microsoft_teams/mod.fp
similarity index 100%
rename from send_message_to_user_in_microsoft_teams/mod.fp
rename to messaging/send_message_to_user_in_microsoft_teams/mod.fp
diff --git a/send_message_to_user_in_microsoft_teams/send_message_to_user_in_microsoft_teams.fp b/messaging/send_message_to_user_in_microsoft_teams/send_message_to_user_in_microsoft_teams.fp
similarity index 100%
rename from send_message_to_user_in_microsoft_teams/send_message_to_user_in_microsoft_teams.fp
rename to messaging/send_message_to_user_in_microsoft_teams/send_message_to_user_in_microsoft_teams.fp
diff --git a/notify_teams_gitlab_project_visibility/variables.fp b/messaging/send_message_to_user_in_microsoft_teams/variables.fp
similarity index 100%
rename from notify_teams_gitlab_project_visibility/variables.fp
rename to messaging/send_message_to_user_in_microsoft_teams/variables.fp
diff --git a/simple/send_slack_message/README.md b/messaging/send_slack_message/README.md
similarity index 100%
rename from simple/send_slack_message/README.md
rename to messaging/send_slack_message/README.md
diff --git a/simple/send_slack_message/mod.fp b/messaging/send_slack_message/mod.fp
similarity index 100%
rename from simple/send_slack_message/mod.fp
rename to messaging/send_slack_message/mod.fp
diff --git a/simple/send_slack_message/send_slack_message.fp b/messaging/send_slack_message/send_slack_message.fp
similarity index 100%
rename from simple/send_slack_message/send_slack_message.fp
rename to messaging/send_slack_message/send_slack_message.fp
diff --git a/simple/send_slack_message_using_cron/README.md b/messaging/send_slack_message_using_cron/README.md
similarity index 100%
rename from simple/send_slack_message_using_cron/README.md
rename to messaging/send_slack_message_using_cron/README.md
diff --git a/simple/send_slack_message_using_cron/mod.fp b/messaging/send_slack_message_using_cron/mod.fp
similarity index 100%
rename from simple/send_slack_message_using_cron/mod.fp
rename to messaging/send_slack_message_using_cron/mod.fp
diff --git a/simple/send_slack_message_using_cron/send_slack_message_using_cron.fp b/messaging/send_slack_message_using_cron/send_slack_message_using_cron.fp
similarity index 100%
rename from simple/send_slack_message_using_cron/send_slack_message_using_cron.fp
rename to messaging/send_slack_message_using_cron/send_slack_message_using_cron.fp
diff --git a/simple/send_teams_message/README.md b/messaging/send_teams_message/README.md
similarity index 100%
rename from simple/send_teams_message/README.md
rename to messaging/send_teams_message/README.md
diff --git a/simple/send_teams_message/flowpipe.fpvars.example b/messaging/send_teams_message/flowpipe.fpvars.example
similarity index 100%
rename from simple/send_teams_message/flowpipe.fpvars.example
rename to messaging/send_teams_message/flowpipe.fpvars.example
diff --git a/simple/send_teams_message/mod.fp b/messaging/send_teams_message/mod.fp
similarity index 100%
rename from simple/send_teams_message/mod.fp
rename to messaging/send_teams_message/mod.fp
diff --git a/simple/send_teams_message/send_teams_message.fp b/messaging/send_teams_message/send_teams_message.fp
similarity index 100%
rename from simple/send_teams_message/send_teams_message.fp
rename to messaging/send_teams_message/send_teams_message.fp
diff --git a/simple/send_teams_message/variables.fp b/messaging/send_teams_message/variables.fp
similarity index 100%
rename from simple/send_teams_message/variables.fp
rename to messaging/send_teams_message/variables.fp
diff --git a/simple/throw_error_example_using_slack/README.md b/messaging/throw_error_example_using_slack/README.md
similarity index 100%
rename from simple/throw_error_example_using_slack/README.md
rename to messaging/throw_error_example_using_slack/README.md
diff --git a/simple/throw_error_example_using_slack/mod.fp b/messaging/throw_error_example_using_slack/mod.fp
similarity index 100%
rename from simple/throw_error_example_using_slack/mod.fp
rename to messaging/throw_error_example_using_slack/mod.fp
diff --git a/simple/throw_error_example_using_slack/throw_error_example_using_slack.fp b/messaging/throw_error_example_using_slack/throw_error_example_using_slack.fp
similarity index 100%
rename from simple/throw_error_example_using_slack/throw_error_example_using_slack.fp
rename to messaging/throw_error_example_using_slack/throw_error_example_using_slack.fp
diff --git a/simple/http_list_pagination/README.md b/monitoring/http_list_pagination/README.md
similarity index 100%
rename from simple/http_list_pagination/README.md
rename to monitoring/http_list_pagination/README.md
diff --git a/simple/http_list_pagination/http_list_pagination.fp b/monitoring/http_list_pagination/http_list_pagination.fp
similarity index 100%
rename from simple/http_list_pagination/http_list_pagination.fp
rename to monitoring/http_list_pagination/http_list_pagination.fp
diff --git a/simple/http_list_pagination/mod.fp b/monitoring/http_list_pagination/mod.fp
similarity index 100%
rename from simple/http_list_pagination/mod.fp
rename to monitoring/http_list_pagination/mod.fp
diff --git a/run_search_in_splunk/README.md b/monitoring/run_search_in_splunk/README.md
similarity index 100%
rename from run_search_in_splunk/README.md
rename to monitoring/run_search_in_splunk/README.md
diff --git a/run_search_in_splunk/flowpipe.fpvars.example b/monitoring/run_search_in_splunk/flowpipe.fpvars.example
similarity index 100%
rename from run_search_in_splunk/flowpipe.fpvars.example
rename to monitoring/run_search_in_splunk/flowpipe.fpvars.example
diff --git a/run_search_in_splunk/mod.fp b/monitoring/run_search_in_splunk/mod.fp
similarity index 100%
rename from run_search_in_splunk/mod.fp
rename to monitoring/run_search_in_splunk/mod.fp
diff --git a/run_search_in_splunk/run_search_in_splunk.fp b/monitoring/run_search_in_splunk/run_search_in_splunk.fp
similarity index 100%
rename from run_search_in_splunk/run_search_in_splunk.fp
rename to monitoring/run_search_in_splunk/run_search_in_splunk.fp
diff --git a/run_search_in_splunk/variables.fp b/monitoring/run_search_in_splunk/variables.fp
similarity index 100%
rename from run_search_in_splunk/variables.fp
rename to monitoring/run_search_in_splunk/variables.fp
diff --git a/ip_profiler/README.md b/networking/ip_profiler/README.md
similarity index 100%
rename from ip_profiler/README.md
rename to networking/ip_profiler/README.md
diff --git a/ip_profiler/ip_profiler.fp b/networking/ip_profiler/ip_profiler.fp
similarity index 100%
rename from ip_profiler/ip_profiler.fp
rename to networking/ip_profiler/ip_profiler.fp
diff --git a/ip_profiler/mod.fp b/networking/ip_profiler/mod.fp
similarity index 100%
rename from ip_profiler/mod.fp
rename to networking/ip_profiler/mod.fp
diff --git a/csv_to_json/README.md b/productivity/csv_to_json/README.md
similarity index 100%
rename from csv_to_json/README.md
rename to productivity/csv_to_json/README.md
diff --git a/csv_to_json/local_csv_file_to_json.fp b/productivity/csv_to_json/local_csv_file_to_json.fp
similarity index 100%
rename from csv_to_json/local_csv_file_to_json.fp
rename to productivity/csv_to_json/local_csv_file_to_json.fp
diff --git a/csv_to_json/mod.fp b/productivity/csv_to_json/mod.fp
similarity index 100%
rename from csv_to_json/mod.fp
rename to productivity/csv_to_json/mod.fp
diff --git a/csv_to_json/users.csv b/productivity/csv_to_json/users.csv
similarity index 100%
rename from csv_to_json/users.csv
rename to productivity/csv_to_json/users.csv
diff --git a/link_jira_issues/README.md b/productivity/link_jira_issues/README.md
similarity index 100%
rename from link_jira_issues/README.md
rename to productivity/link_jira_issues/README.md
diff --git a/link_jira_issues/link_jira_issues.fp b/productivity/link_jira_issues/link_jira_issues.fp
similarity index 100%
rename from link_jira_issues/link_jira_issues.fp
rename to productivity/link_jira_issues/link_jira_issues.fp
diff --git a/link_jira_issues/mod.fp b/productivity/link_jira_issues/mod.fp
similarity index 100%
rename from link_jira_issues/mod.fp
rename to productivity/link_jira_issues/mod.fp
diff --git a/send_top_show_hn_email/README.md b/productivity/send_top_show_hn_email/README.md
similarity index 100%
rename from send_top_show_hn_email/README.md
rename to productivity/send_top_show_hn_email/README.md
diff --git a/send_top_show_hn_email/flowpipe.fpvars.example b/productivity/send_top_show_hn_email/flowpipe.fpvars.example
similarity index 100%
rename from send_top_show_hn_email/flowpipe.fpvars.example
rename to productivity/send_top_show_hn_email/flowpipe.fpvars.example
diff --git a/send_top_show_hn_email/mod.fp b/productivity/send_top_show_hn_email/mod.fp
similarity index 100%
rename from send_top_show_hn_email/mod.fp
rename to productivity/send_top_show_hn_email/mod.fp
diff --git a/send_top_show_hn_email/send_top_show_hn_email.fp b/productivity/send_top_show_hn_email/send_top_show_hn_email.fp
similarity index 100%
rename from send_top_show_hn_email/send_top_show_hn_email.fp
rename to productivity/send_top_show_hn_email/send_top_show_hn_email.fp
diff --git a/send_top_show_hn_email/variables.fp b/productivity/send_top_show_hn_email/variables.fp
similarity index 100%
rename from send_top_show_hn_email/variables.fp
rename to productivity/send_top_show_hn_email/variables.fp
diff --git a/aws_iam_user_group_membership/README.md b/public_cloud/aws_iam_user_group_membership/README.md
similarity index 100%
rename from aws_iam_user_group_membership/README.md
rename to public_cloud/aws_iam_user_group_membership/README.md
diff --git a/aws_iam_user_group_membership/aws_iam_user_group_membership.fp b/public_cloud/aws_iam_user_group_membership/aws_iam_user_group_membership.fp
similarity index 100%
rename from aws_iam_user_group_membership/aws_iam_user_group_membership.fp
rename to public_cloud/aws_iam_user_group_membership/aws_iam_user_group_membership.fp
diff --git a/aws_iam_user_group_membership/flowpipe.fpvars.example b/public_cloud/aws_iam_user_group_membership/flowpipe.fpvars.example
similarity index 100%
rename from aws_iam_user_group_membership/flowpipe.fpvars.example
rename to public_cloud/aws_iam_user_group_membership/flowpipe.fpvars.example
diff --git a/aws_iam_user_group_membership/locals.fp b/public_cloud/aws_iam_user_group_membership/locals.fp
similarity index 100%
rename from aws_iam_user_group_membership/locals.fp
rename to public_cloud/aws_iam_user_group_membership/locals.fp
diff --git a/aws_iam_user_group_membership/mod.fp b/public_cloud/aws_iam_user_group_membership/mod.fp
similarity index 100%
rename from aws_iam_user_group_membership/mod.fp
rename to public_cloud/aws_iam_user_group_membership/mod.fp
diff --git a/aws_iam_user_group_membership/variables.fp b/public_cloud/aws_iam_user_group_membership/variables.fp
similarity index 100%
rename from aws_iam_user_group_membership/variables.fp
rename to public_cloud/aws_iam_user_group_membership/variables.fp
diff --git a/deactivate_expired_aws_iam_access_keys/deactivate_expired_aws_iam_access_keys.fp b/public_cloud/deactivate_expired_aws_iam_access_keys/deactivate_expired_aws_iam_access_keys.fp
similarity index 100%
rename from deactivate_expired_aws_iam_access_keys/deactivate_expired_aws_iam_access_keys.fp
rename to public_cloud/deactivate_expired_aws_iam_access_keys/deactivate_expired_aws_iam_access_keys.fp
diff --git a/deactivate_expired_aws_iam_access_keys/flowpipe.fpvars.example b/public_cloud/deactivate_expired_aws_iam_access_keys/flowpipe.fpvars.example
similarity index 100%
rename from deactivate_expired_aws_iam_access_keys/flowpipe.fpvars.example
rename to public_cloud/deactivate_expired_aws_iam_access_keys/flowpipe.fpvars.example
diff --git a/deactivate_expired_aws_iam_access_keys/mod.fp b/public_cloud/deactivate_expired_aws_iam_access_keys/mod.fp
similarity index 100%
rename from deactivate_expired_aws_iam_access_keys/mod.fp
rename to public_cloud/deactivate_expired_aws_iam_access_keys/mod.fp
diff --git a/deactivate_expired_aws_iam_access_keys/variables.fp b/public_cloud/deactivate_expired_aws_iam_access_keys/variables.fp
similarity index 100%
rename from deactivate_expired_aws_iam_access_keys/variables.fp
rename to public_cloud/deactivate_expired_aws_iam_access_keys/variables.fp
diff --git a/deallocate_and_delete_unapproved_azure_vms/README.md b/public_cloud/deallocate_and_delete_unapproved_azure_vms/README.md
similarity index 100%
rename from deallocate_and_delete_unapproved_azure_vms/README.md
rename to public_cloud/deallocate_and_delete_unapproved_azure_vms/README.md
diff --git a/deallocate_and_delete_unapproved_azure_vms/deallocate_and_delete_unapproved_azure_vms.fp b/public_cloud/deallocate_and_delete_unapproved_azure_vms/deallocate_and_delete_unapproved_azure_vms.fp
similarity index 100%
rename from deallocate_and_delete_unapproved_azure_vms/deallocate_and_delete_unapproved_azure_vms.fp
rename to public_cloud/deallocate_and_delete_unapproved_azure_vms/deallocate_and_delete_unapproved_azure_vms.fp
diff --git a/deallocate_and_delete_unapproved_azure_vms/flowpipe.fpvars.example b/public_cloud/deallocate_and_delete_unapproved_azure_vms/flowpipe.fpvars.example
similarity index 100%
rename from deallocate_and_delete_unapproved_azure_vms/flowpipe.fpvars.example
rename to public_cloud/deallocate_and_delete_unapproved_azure_vms/flowpipe.fpvars.example
diff --git a/deallocate_and_delete_unapproved_azure_vms/flowpipe_pipeline_run.png b/public_cloud/deallocate_and_delete_unapproved_azure_vms/flowpipe_pipeline_run.png
similarity index 100%
rename from deallocate_and_delete_unapproved_azure_vms/flowpipe_pipeline_run.png
rename to public_cloud/deallocate_and_delete_unapproved_azure_vms/flowpipe_pipeline_run.png
diff --git a/deallocate_and_delete_unapproved_azure_vms/locals.fp b/public_cloud/deallocate_and_delete_unapproved_azure_vms/locals.fp
similarity index 100%
rename from deallocate_and_delete_unapproved_azure_vms/locals.fp
rename to public_cloud/deallocate_and_delete_unapproved_azure_vms/locals.fp
diff --git a/deallocate_and_delete_unapproved_azure_vms/mod.fp b/public_cloud/deallocate_and_delete_unapproved_azure_vms/mod.fp
similarity index 100%
rename from deallocate_and_delete_unapproved_azure_vms/mod.fp
rename to public_cloud/deallocate_and_delete_unapproved_azure_vms/mod.fp
diff --git a/deallocate_and_delete_unapproved_azure_vms/variables.fp b/public_cloud/deallocate_and_delete_unapproved_azure_vms/variables.fp
similarity index 100%
rename from deallocate_and_delete_unapproved_azure_vms/variables.fp
rename to public_cloud/deallocate_and_delete_unapproved_azure_vms/variables.fp
diff --git a/offboard_azuread_users/README.md b/public_cloud/offboard_azuread_users/README.md
similarity index 100%
rename from offboard_azuread_users/README.md
rename to public_cloud/offboard_azuread_users/README.md
diff --git a/offboard_azuread_users/create_user_update_issue.fp b/public_cloud/offboard_azuread_users/create_user_update_issue.fp
similarity index 100%
rename from offboard_azuread_users/create_user_update_issue.fp
rename to public_cloud/offboard_azuread_users/create_user_update_issue.fp
diff --git a/offboard_azuread_users/flowpipe.fpvars.example b/public_cloud/offboard_azuread_users/flowpipe.fpvars.example
similarity index 100%
rename from offboard_azuread_users/flowpipe.fpvars.example
rename to public_cloud/offboard_azuread_users/flowpipe.fpvars.example
diff --git a/offboard_azuread_users/mod.fp b/public_cloud/offboard_azuread_users/mod.fp
similarity index 100%
rename from offboard_azuread_users/mod.fp
rename to public_cloud/offboard_azuread_users/mod.fp
diff --git a/offboard_azuread_users/scheduled_user_delete_action.fp b/public_cloud/offboard_azuread_users/scheduled_user_delete_action.fp
similarity index 100%
rename from offboard_azuread_users/scheduled_user_delete_action.fp
rename to public_cloud/offboard_azuread_users/scheduled_user_delete_action.fp
diff --git a/offboard_azuread_users/scheduled_user_disable_action.fp b/public_cloud/offboard_azuread_users/scheduled_user_disable_action.fp
similarity index 100%
rename from offboard_azuread_users/scheduled_user_disable_action.fp
rename to public_cloud/offboard_azuread_users/scheduled_user_disable_action.fp
diff --git a/offboard_azuread_users/scheduled_user_enable_action.fp b/public_cloud/offboard_azuread_users/scheduled_user_enable_action.fp
similarity index 100%
rename from offboard_azuread_users/scheduled_user_enable_action.fp
rename to public_cloud/offboard_azuread_users/scheduled_user_enable_action.fp
diff --git a/offboard_azuread_users/variables.fp b/public_cloud/offboard_azuread_users/variables.fp
similarity index 100%
rename from offboard_azuread_users/variables.fp
rename to public_cloud/offboard_azuread_users/variables.fp
diff --git a/remediate_aws_guardduty_alerts/README.md b/public_cloud/remediate_aws_guardduty_alerts/README.md
similarity index 100%
rename from remediate_aws_guardduty_alerts/README.md
rename to public_cloud/remediate_aws_guardduty_alerts/README.md
diff --git a/remediate_aws_guardduty_alerts/block_s3_public_access.fp b/public_cloud/remediate_aws_guardduty_alerts/block_s3_public_access.fp
similarity index 100%
rename from remediate_aws_guardduty_alerts/block_s3_public_access.fp
rename to public_cloud/remediate_aws_guardduty_alerts/block_s3_public_access.fp
diff --git a/remediate_aws_guardduty_alerts/disassociate_iam_instance_profile.fp b/public_cloud/remediate_aws_guardduty_alerts/disassociate_iam_instance_profile.fp
similarity index 100%
rename from remediate_aws_guardduty_alerts/disassociate_iam_instance_profile.fp
rename to public_cloud/remediate_aws_guardduty_alerts/disassociate_iam_instance_profile.fp
diff --git a/remediate_aws_guardduty_alerts/flowpipe.fpvars.example b/public_cloud/remediate_aws_guardduty_alerts/flowpipe.fpvars.example
similarity index 100%
rename from remediate_aws_guardduty_alerts/flowpipe.fpvars.example
rename to public_cloud/remediate_aws_guardduty_alerts/flowpipe.fpvars.example
diff --git a/remediate_aws_guardduty_alerts/mod.fp b/public_cloud/remediate_aws_guardduty_alerts/mod.fp
similarity index 100%
rename from remediate_aws_guardduty_alerts/mod.fp
rename to public_cloud/remediate_aws_guardduty_alerts/mod.fp
diff --git a/remediate_aws_guardduty_alerts/remediate_aws_guardduty_alerts.fp b/public_cloud/remediate_aws_guardduty_alerts/remediate_aws_guardduty_alerts.fp
similarity index 100%
rename from remediate_aws_guardduty_alerts/remediate_aws_guardduty_alerts.fp
rename to public_cloud/remediate_aws_guardduty_alerts/remediate_aws_guardduty_alerts.fp
diff --git a/remediate_aws_guardduty_alerts/variables.fp b/public_cloud/remediate_aws_guardduty_alerts/variables.fp
similarity index 100%
rename from remediate_aws_guardduty_alerts/variables.fp
rename to public_cloud/remediate_aws_guardduty_alerts/variables.fp
diff --git a/snapshot_isolate_gcp_compute_instance/README.md b/public_cloud/snapshot_isolate_gcp_compute_instance/README.md
similarity index 100%
rename from snapshot_isolate_gcp_compute_instance/README.md
rename to public_cloud/snapshot_isolate_gcp_compute_instance/README.md
diff --git a/snapshot_isolate_gcp_compute_instance/flowpipe.fpvars.example b/public_cloud/snapshot_isolate_gcp_compute_instance/flowpipe.fpvars.example
similarity index 100%
rename from snapshot_isolate_gcp_compute_instance/flowpipe.fpvars.example
rename to public_cloud/snapshot_isolate_gcp_compute_instance/flowpipe.fpvars.example
diff --git a/snapshot_isolate_gcp_compute_instance/mod.fp b/public_cloud/snapshot_isolate_gcp_compute_instance/mod.fp
similarity index 100%
rename from snapshot_isolate_gcp_compute_instance/mod.fp
rename to public_cloud/snapshot_isolate_gcp_compute_instance/mod.fp
diff --git a/snapshot_isolate_gcp_compute_instance/snapshot_isolate_gcp_compute_instance.fp b/public_cloud/snapshot_isolate_gcp_compute_instance/snapshot_isolate_gcp_compute_instance.fp
similarity index 100%
rename from snapshot_isolate_gcp_compute_instance/snapshot_isolate_gcp_compute_instance.fp
rename to public_cloud/snapshot_isolate_gcp_compute_instance/snapshot_isolate_gcp_compute_instance.fp
diff --git a/snapshot_isolate_gcp_compute_instance/variables.fp b/public_cloud/snapshot_isolate_gcp_compute_instance/variables.fp
similarity index 100%
rename from snapshot_isolate_gcp_compute_instance/variables.fp
rename to public_cloud/snapshot_isolate_gcp_compute_instance/variables.fp
diff --git a/domains_review_through_multiple_sources/README.md b/security/domains_review_through_multiple_sources/README.md
similarity index 100%
rename from domains_review_through_multiple_sources/README.md
rename to security/domains_review_through_multiple_sources/README.md
diff --git a/domains_review_through_multiple_sources/domains_review_through_multiple_sources.fp b/security/domains_review_through_multiple_sources/domains_review_through_multiple_sources.fp
similarity index 100%
rename from domains_review_through_multiple_sources/domains_review_through_multiple_sources.fp
rename to security/domains_review_through_multiple_sources/domains_review_through_multiple_sources.fp
diff --git a/domains_review_through_multiple_sources/flowpipe.fpvars.example b/security/domains_review_through_multiple_sources/flowpipe.fpvars.example
similarity index 100%
rename from domains_review_through_multiple_sources/flowpipe.fpvars.example
rename to security/domains_review_through_multiple_sources/flowpipe.fpvars.example
diff --git a/domains_review_through_multiple_sources/mod.fp b/security/domains_review_through_multiple_sources/mod.fp
similarity index 100%
rename from domains_review_through_multiple_sources/mod.fp
rename to security/domains_review_through_multiple_sources/mod.fp
diff --git a/domains_review_through_multiple_sources/variables.fp b/security/domains_review_through_multiple_sources/variables.fp
similarity index 100%
rename from domains_review_through_multiple_sources/variables.fp
rename to security/domains_review_through_multiple_sources/variables.fp
diff --git a/lookup_iocs/README.md b/security/lookup_iocs/README.md
similarity index 100%
rename from lookup_iocs/README.md
rename to security/lookup_iocs/README.md
diff --git a/lookup_iocs/flowpipe.fpvars.example b/security/lookup_iocs/flowpipe.fpvars.example
similarity index 100%
rename from lookup_iocs/flowpipe.fpvars.example
rename to security/lookup_iocs/flowpipe.fpvars.example
diff --git a/lookup_iocs/locals.fp b/security/lookup_iocs/locals.fp
similarity index 100%
rename from lookup_iocs/locals.fp
rename to security/lookup_iocs/locals.fp
diff --git a/lookup_iocs/lookup_domain.fp b/security/lookup_iocs/lookup_domain.fp
similarity index 100%
rename from lookup_iocs/lookup_domain.fp
rename to security/lookup_iocs/lookup_domain.fp
diff --git a/lookup_iocs/lookup_email.fp b/security/lookup_iocs/lookup_email.fp
similarity index 100%
rename from lookup_iocs/lookup_email.fp
rename to security/lookup_iocs/lookup_email.fp
diff --git a/lookup_iocs/lookup_file_hash.fp b/security/lookup_iocs/lookup_file_hash.fp
similarity index 100%
rename from lookup_iocs/lookup_file_hash.fp
rename to security/lookup_iocs/lookup_file_hash.fp
diff --git a/lookup_iocs/lookup_iocs.fp b/security/lookup_iocs/lookup_iocs.fp
similarity index 100%
rename from lookup_iocs/lookup_iocs.fp
rename to security/lookup_iocs/lookup_iocs.fp
diff --git a/lookup_iocs/lookup_ip.fp b/security/lookup_iocs/lookup_ip.fp
similarity index 100%
rename from lookup_iocs/lookup_ip.fp
rename to security/lookup_iocs/lookup_ip.fp
diff --git a/lookup_iocs/lookup_url.fp b/security/lookup_iocs/lookup_url.fp
similarity index 100%
rename from lookup_iocs/lookup_url.fp
rename to security/lookup_iocs/lookup_url.fp
diff --git a/lookup_iocs/mod.fp b/security/lookup_iocs/mod.fp
similarity index 100%
rename from lookup_iocs/mod.fp
rename to security/lookup_iocs/mod.fp
diff --git a/lookup_iocs/variables.fp b/security/lookup_iocs/variables.fp
similarity index 100%
rename from lookup_iocs/variables.fp
rename to security/lookup_iocs/variables.fp
diff --git a/scan_file_hash_on_virustotal/README.md b/security/scan_file_hash_on_virustotal/README.md
similarity index 100%
rename from scan_file_hash_on_virustotal/README.md
rename to security/scan_file_hash_on_virustotal/README.md
diff --git a/scan_file_hash_on_virustotal/flowpipe.fpvars.example b/security/scan_file_hash_on_virustotal/flowpipe.fpvars.example
similarity index 100%
rename from scan_file_hash_on_virustotal/flowpipe.fpvars.example
rename to security/scan_file_hash_on_virustotal/flowpipe.fpvars.example
diff --git a/scan_file_hash_on_virustotal/mod.fp b/security/scan_file_hash_on_virustotal/mod.fp
similarity index 100%
rename from scan_file_hash_on_virustotal/mod.fp
rename to security/scan_file_hash_on_virustotal/mod.fp
diff --git a/scan_file_hash_on_virustotal/scan_file_hash_on_virustotal.fp b/security/scan_file_hash_on_virustotal/scan_file_hash_on_virustotal.fp
similarity index 100%
rename from scan_file_hash_on_virustotal/scan_file_hash_on_virustotal.fp
rename to security/scan_file_hash_on_virustotal/scan_file_hash_on_virustotal.fp
diff --git a/scan_file_hash_on_virustotal/variables.fp b/security/scan_file_hash_on_virustotal/variables.fp
similarity index 100%
rename from scan_file_hash_on_virustotal/variables.fp
rename to security/scan_file_hash_on_virustotal/variables.fp
diff --git a/slack_scanner/README.md b/security/slack_scanner/README.md
similarity index 100%
rename from slack_scanner/README.md
rename to security/slack_scanner/README.md
diff --git a/slack_scanner/flowpipe.fpvars.example b/security/slack_scanner/flowpipe.fpvars.example
similarity index 100%
rename from slack_scanner/flowpipe.fpvars.example
rename to security/slack_scanner/flowpipe.fpvars.example
diff --git a/slack_scanner/locals.fp b/security/slack_scanner/locals.fp
similarity index 100%
rename from slack_scanner/locals.fp
rename to security/slack_scanner/locals.fp
diff --git a/slack_scanner/mod.fp b/security/slack_scanner/mod.fp
similarity index 100%
rename from slack_scanner/mod.fp
rename to security/slack_scanner/mod.fp
diff --git a/slack_scanner/slack_scanner.fp b/security/slack_scanner/slack_scanner.fp
similarity index 100%
rename from slack_scanner/slack_scanner.fp
rename to security/slack_scanner/slack_scanner.fp
diff --git a/slack_scanner/variables.fp b/security/slack_scanner/variables.fp
similarity index 100%
rename from slack_scanner/variables.fp
rename to security/slack_scanner/variables.fp
diff --git a/notify_slack_new_github_release/README.md b/software_development/notify_slack_new_github_release/README.md
similarity index 100%
rename from notify_slack_new_github_release/README.md
rename to software_development/notify_slack_new_github_release/README.md
diff --git a/notify_slack_new_github_release/flowpipe.fpvars.example b/software_development/notify_slack_new_github_release/flowpipe.fpvars.example
similarity index 100%
rename from notify_slack_new_github_release/flowpipe.fpvars.example
rename to software_development/notify_slack_new_github_release/flowpipe.fpvars.example
diff --git a/notify_slack_new_github_release/mod.fp b/software_development/notify_slack_new_github_release/mod.fp
similarity index 100%
rename from notify_slack_new_github_release/mod.fp
rename to software_development/notify_slack_new_github_release/mod.fp
diff --git a/notify_slack_new_github_release/notify_slack_new_github_release.fp b/software_development/notify_slack_new_github_release/notify_slack_new_github_release.fp
similarity index 100%
rename from notify_slack_new_github_release/notify_slack_new_github_release.fp
rename to software_development/notify_slack_new_github_release/notify_slack_new_github_release.fp
diff --git a/notify_slack_new_github_release/variables.fp b/software_development/notify_slack_new_github_release/variables.fp
similarity index 100%
rename from notify_slack_new_github_release/variables.fp
rename to software_development/notify_slack_new_github_release/variables.fp
diff --git a/notify_teams_gitlab_project_visibility/README.md b/software_development/notify_teams_gitlab_project_visibility/README.md
similarity index 100%
rename from notify_teams_gitlab_project_visibility/README.md
rename to software_development/notify_teams_gitlab_project_visibility/README.md
diff --git a/notify_teams_gitlab_project_visibility/flowpipe.fpvars.example b/software_development/notify_teams_gitlab_project_visibility/flowpipe.fpvars.example
similarity index 100%
rename from notify_teams_gitlab_project_visibility/flowpipe.fpvars.example
rename to software_development/notify_teams_gitlab_project_visibility/flowpipe.fpvars.example
diff --git a/notify_teams_gitlab_project_visibility/flowpipe_pipeline_run.png b/software_development/notify_teams_gitlab_project_visibility/flowpipe_pipeline_run.png
similarity index 100%
rename from notify_teams_gitlab_project_visibility/flowpipe_pipeline_run.png
rename to software_development/notify_teams_gitlab_project_visibility/flowpipe_pipeline_run.png
diff --git a/notify_teams_gitlab_project_visibility/locals.fp b/software_development/notify_teams_gitlab_project_visibility/locals.fp
similarity index 100%
rename from notify_teams_gitlab_project_visibility/locals.fp
rename to software_development/notify_teams_gitlab_project_visibility/locals.fp
diff --git a/notify_teams_gitlab_project_visibility/mod.fp b/software_development/notify_teams_gitlab_project_visibility/mod.fp
similarity index 100%
rename from notify_teams_gitlab_project_visibility/mod.fp
rename to software_development/notify_teams_gitlab_project_visibility/mod.fp
diff --git a/notify_teams_gitlab_project_visibility/notify_teams_gitlab_project_visibility.fp b/software_development/notify_teams_gitlab_project_visibility/notify_teams_gitlab_project_visibility.fp
similarity index 100%
rename from notify_teams_gitlab_project_visibility/notify_teams_gitlab_project_visibility.fp
rename to software_development/notify_teams_gitlab_project_visibility/notify_teams_gitlab_project_visibility.fp
diff --git a/send_message_to_user_in_microsoft_teams/variables.fp b/software_development/notify_teams_gitlab_project_visibility/variables.fp
similarity index 100%
rename from send_message_to_user_in_microsoft_teams/variables.fp
rename to software_development/notify_teams_gitlab_project_visibility/variables.fp