Pulled in serialiser and deserialiser category headers into main header
Renamed categories and comment public headers