Fix folder nesting