added sort, moved dirs