Preparing restructuring for android-sdt usage