Cleaning up folder structure, again