fixed folder nesting