added some dirs, reordered