Directory restructuring for clearer layout