Revert "Directories Galore"

This reverts commit 3a2b427abb01f64f0b8bacbce5c3d2671648e60d.