reorganize to more standard file structure that will make working in android studio easier.
Merge remote-tracking branch 'origin/master'