updated directory nesting