New directory hierarchy; Fix missing parenthesis