Folder organization support - refactor