-moved all includes into "include" directory -extracted "wait...()"-routines into separate files
The note is not visible to the blocked user.