Move NetworkService to separate service