Tidy folder structure.