Standardize with other plugin repo layouts
Mild fix ups