Moving imports to it's own plugin