restructured apklib projects