Change the log dir, also add Scheduling Refactoring

Change-Id: Ib54bcdcd2c978eb012c7504aef09371fc7d1c49b