Folder organization support - refactory