Extract default handler to separate files