Added Android App, switched to folders fo different oss