removed unnecessary nesting of source dirs