Move privacy into directive, add notification directive