code style: line breaks

Apply rector renames

First go at moving the plugin classes into their own namespace