Reduce directory struture complexity