reorganize to more standard file structure that will make working in android studio easier.