Re-organize log file structure