Split off notification code (intermediate reorganisation step)
Split off cidlog and phonebook code (intermediate reorganisation step)