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

adjust folder structure