Add android version, change directory structure
android code cleanup