Revert "Revert "Directories Galore""

This reverts commit 8ec152505a7f8075f470f200ee500bf66cb5aa26.
Revert "More directory stuff"

This reverts commit 8bd3b89174a911f1eff3f9e70b91f78f80ffd3f9.
Fixing things hopefully