Revise directory structure