More folder tidy-ups.