minor naming changes, adding Android project/tests