Moved marshallers to src/ui/gui