put service in its own class

put service in its own class so that It can be included and be notified easily
Thanks