What is the correct way to setup multiple logically organized sub folders in a terraform repo?

You are seeing this issue because terraform ignores subfolders, so those resources are not being included at all anymore. You would need to configure the subfolders to be Terraform Modules, and then include those modules in your root main.tf