modify from work svn
adjust dir and files