Move plugins out of plugins/settings into plugins