Move service handlers into separate files