Decouple v1 and v2 exceptions into separate files