Refactored folders and names
Merge pull request #2 from LiLiuScott/AndroidStudioVersion

Refactored folders and names