Move service into folder