Revert "no do it as one directory and one server please"

This reverts commit a885c45cc66d009a29587974cbc83c1df2b9bb91.
Revert "maybe pretending its two servers is causing more issues than solving"

This reverts commit dfb218ae02fafb8ce7a50be51fcd5f892259d749.