moved packages around in preparation for integration into version5 of the android app