more modular structuring. removing service