Move handlers to dir