Upfront work to move controllers back to pencil blue plugin after admin ...

...tweaks are complete.