Moved the changes from the modules to the site.pp so that there are only modification that are must required.
Updated the shared variables.