#78: refactor listener + other services declaration