Moved Service out of Solution