generalize logbook format and move files to subdirectories
Merge remote-tracking branch 'origin/master'