Renamed some classes. Partial stream marshaller.