shifted BaseCat class and updated Android.mk