Splitting the service into files