Guanako: Fixed threading crashes / freezes, cleaner structure