undid restructuring, AndroidStudios needs stuff in base level and too lazy to try and fix settings to allow it to be in a subfolder.
Merge remote-tracking branch 'origin/master'