- new and more readable arrangement of the dirs