Move client-specific errors with the client code
Move files around in an effort to make things cleaner