moved serialization functions into separate file
removed unnecessary include