Fix Directory nesting