Better structure now
Merge branch 'master' of https://github.com/ec327teamlantern/Android-App