Restructured packages, also removed androlog as its not in use