revise file structure and comments