Fix Locations spec with new setup
Fixed up plugins-plugin with new dir structure