Refactoring; FailingDeserializer was in the wrong place for some reason