Refactor for one-level folder depth