fixed time logging bug
folder and file ordering
folder and file ordering