restructured project to have android and test projects