Changed handler files to service files