Split into multiple files, renamed serialization methods, refactoring (WIP)