revise file structure