Revise folder organization