Turned wp-cli into a global variable
Lots of structural changes moved more stuff into wp-sites and all