fixed directory nesting and simplified a few examples