Hack Log and Tag and rearrange Logging System

Change-Id: I99675232ed7de8f2d6ccf09514b90d1382e4f76e