Directory changes

Use latest Android gradle standards.