Deprecate module_site and use module and site separately

[kjaymiller]

We will need to update the CLI prior to completely remove the module:site