Reorganized some plugin imports