Re-org to make it easier to clone into plugins dir