refactor structure
refactor structure, but omit two file