New directory organization, number of separate directories reduced!