Serializer Refactoring

Yet another refactoring :)
* Should speed up compilation
* No regressions so far (but there are serialization bugs in current mainline ...)
* Save format unchanged
! need at least compilation test with VS