Some dust cleaning as promised in SF mailing list

Grouping some less used files and folders together