Snapshot before rework of packages
Refactor serialization and simplify configuration