Getting rid of folder nesting