added new files meged and made service code solid