More file structure tweaks