Rearrange model plugins
Move connection builder class to services directory