Global refactoring; getting rid of serialization classes over the solution