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

adjust folder structure
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop