rename 'state' dir to 'log'
Merge branch 'nyov/logs' into nyov/master