Folder structure tweaks