simple service complete, restructuruing the app as well