Making modules instead of simple services