Change to Android structure