merge andreas flicks work on file timestamps and directory handling, and the beginning of a device control