Reshuffled the directory layout

Ensured the layout is conducive to container mounts.