Divided services code into different file