Resolve "Organize folder structure to match Docker images"
Description
[Describe changes/solution; problem description should be in issue]
Notes to review (code/docs/QA)
Related issues
Closes #2297 (closed)
[Describe changes/solution; problem description should be in issue]
Closes #2297 (closed)