reorganised source tree so that we can run tests from command line and android studio