add -f optional,improve something

change directory structure