changed modules - now they provide functions, that generate required dictionaries
removed word Subject from notifications