fixed typos in serializer, renamed folder, fixed parser