Moves directories to use latest android/gradle standards.
Moves directories to use latest android/gradle standards.
Merge pull request #84 from cauchymop/directory_changes

Directory changes