Minor tweaks to folder / file structure