Refactor imports to be minification compatible - Merge when human and PopGen pulls are ready