issue #2905:adjust folder structure
fix conflicts
Merge pull request #3926 from minggo/iss2905-adjust_folder

adjust folder structure