directory structure tweaks