Some changes to service folder