diff --git a/Puppetfile b/Puppetfile
index c96d408..fad48cb 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -10,25 +10,6 @@
 
 forge "https://forgeapi.puppetlabs.com"
 
-mod 'beersy-pe_code_manager_easy_setup', '2.0.0'
-mod 'tspy-code_deploy', '1.0.2'
-mod 'puppetlabs-exec', '0.2.0'
-mod 'beersy-hiera_lookup', '0.1.0'
-
-# google
-mod 'google-gauth', '0.2.1'
-mod 'google-giam', '0.1.1'
-mod 'google-gresourcemanager', '0.1.1'
-mod 'google-gstorage', '0.2.1'
-mod 'google-gdns', '0.1.1'
-mod 'google-cloud', '0.3.0'
-mod 'google-gsql', '0.3.0'
-mod 'google-gcompute', '0.2.1'
-mod 'google-gcontainer', '0.2.0'
-mod 'google-gpubsub', '0.1.0'
-mod 'google-glogging', '0.1.1'
-mod 'google-gspanner', '0.1.0'
-
 # Forge Modules from Puppet
 
 mod 'puppetlabs-apache', '3.2.0'
@@ -40,32 +21,62 @@ mod 'puppetlabs-powershell', '1.0.6'
 mod 'puppetlabs-registry', '1.1.3'
 mod 'puppetlabs-inifile', '1.6.0'
 mod 'puppetlabs-puppetserver_gem', '0.2.0'
+mod 'puppetlabs-motd', '1.4.0'
+mod 'puppetlabs-java', '2.1.0'
+mod 'puppetlabs-stdlib', '4.25.1'
+mod 'puppetlabs-puppet_agent', '1.4.1'
+mod 'puppetlabs-exec', '0.1.0'
+mod 'puppetlabs-resource', '0.1.0'
+mod 'puppetlabs-transition', '0.1.1'
+mod 'puppetlabs-mysql', '5.1.0'
+mod 'puppetlabs-gcc', '0.3.0'
+mod 'puppetlabs-bolt_shim', '0.1.1'
+mod 'puppetlabs-reboot', '2.0.0'
+
+mod 'puppet-iis', '2.0.2'
+mod 'puppet-windows_firewall', '1.0.3'
+mod 'puppet-windowsfeature', '2.0.0'
+mod 'puppet-hiera', '2.1.2'
+mod 'puppet-archive', '3.2.0'
+mod 'puppet-staging', '3.2.0'
+mod 'puppet-nginx', '0.11.0'
+mod 'puppet-rabbitmq', '8.2.2'
+mod 'puppet-rundeck', '5.0.0'
 
 # Forge Community Modules
 
+mod 'beersy-hiera_lookup', '0.1.0'
 mod 'crayfishx-firewalld', '3.1.4'
-mod 'puppet-iis', '2.0.2'
-mod 'puppet-staging', '2.0.1'
-mod 'puppet-windows_firewall', '1.0.3'
-mod 'puppet-windowsfeature', '2.0.0'
-mod 'puppet/hiera', '2.1.2'
 mod 'reidmv-unzip', '0.1.2'
 mod 'stahnma-epel', '1.3.0'
 mod 'herculesteam-augeasproviders_core', '2.1.3'
 mod 'herculesteam-augeasproviders_ssh', '2.5.0'
 mod 'liamjbennett-win_facts', '0.0.2'
-
-mod 'puppetlabs-java', '2.1.0'
-mod 'puppetlabs-stdlib', '4.25.1'
-
-mod 'puppet-archive',
-  :git    => 'https://github.com/voxpupuli/puppet-archive.git',
-  :branch => 'master'
-
 mod 'maestrodev-maven', '1.4.0'
-mod 'puppet-hiera', '3.2.0'
 mod 'puppetlabs-docker', '1.0.5'
 mod 'computology-packagecloud', '0.3.2' 
+mod 'lboynton-rpmforge', '0.1.3'
+mod 'puppetlabs-apt', '2.3.0'
+mod 'gildas-homebrew', '0.4.16'
+mod 'crayfishx-purge', '1.2.0'
+mod 'reidmv-pe_mco_shell_agent', '2.0.0'
+mod 'WhatsARanjit-node_manager', '0.4.2'
+mod 'maestrodev-wget', '1.7.3'
+mod 'stankevich-python', '1.18.2'
+mod 'beersy-taskulator', '0.3.0'
+mod 'beersy-pe_code_manager_easy_setup'
+mod 'lwf-remote_file', '1.1.3'  
+mod 'darin-zypprepo', '1.0.2'
+mod 'camptocamp-systemd', '0.4.0'
+mod 'nate-purge_node', '1.1.0'
+mod 'sensu-sensu', '2.53.0'
+mod 'arioch-redis', '3.1.0'
+mod 'yelp-uchiwa', '2.0.0'
+mod 'computology-packagecloud', '0.3.2'
+mod 'herculesteam-augeasproviders_core', '2.1.4'
+mod 'herculesteam-augeasproviders_sysctl', '2.2.0'
+mod 'beersy-pe_code_manager_easy_setup', '2.0.0'
+mod 'tspy-code_deploy', '1.0.2'
 
 # Module Content from git
 
@@ -76,39 +87,10 @@ mod 'beersy-win_proxy',
   :git    => 'https://github.com/maju6406/puppet-win_proxy.git',
   :commit => '30b2ac4f33d6f0498ec97a419204ccb943d10115'
 
-mod 'puppetlabs-motd', '1.4.0'
-mod 'lboynton-rpmforge', '0.1.3'
-mod 'puppetlabs-apt', '2.3.0'
-mod 'gildas-homebrew', '0.4.16'
-mod 'crayfishx-purge', '1.2.0'
-mod 'reidmv-pe_mco_shell_agent', '2.0.0'
-mod 'WhatsARanjit-node_manager', '0.4.2'
-mod 'maestrodev-wget', '1.7.3'
-mod 'stankevich-python', '1.18.2'
-mod 'puppetlabs-puppet_agent', '1.4.1'
-
-mod 'puppetlabs-exec', '0.1.0'
-mod 'puppetlabs-resource', '0.1.0'
-
-mod 'beersy-taskulator', '0.3.0'
-mod 'beersy-pe_code_manager_easy_setup'
-mod 'puppet-staging', '3.2.0'
-mod 'lwf-remote_file', '1.1.3'  
-mod 'puppetlabs-mysql', '5.1.0'
-mod 'darin-zypprepo', '1.0.2'
-mod 'camptocamp-systemd', '0.4.0'
-mod 'puppetlabs-transition', '0.1.1'
-
-
-mod 'nate-purge_node', '1.1.0'
-
 mod 'beersy-pql_query', 
   :git    => 'https://github.com/maju6406/pql_query.git',
   :branch => 'reporter'
 
-mod 'puppet-rundeck', '5.0.0'
-#mod 'zack-exports', '0.0.6'
-
 mod 'beersy-exports', 
   :git    => 'https://github.com/maju6406/exports.git',
   :branch => 'master'
@@ -129,21 +111,6 @@ mod 'beersy-hiera_eyaml_setup',
   :git    => 'https://github.com/maju6406/eyamlamadingdong.git',
   :branch => 'master'  
   
-  mod 'beersy-plan_runner', 
+mod 'beersy-plan_runner', 
   :git    => 'https://github.com/maju6406/plan_runner.git',
   :branch => 'master'  
-
-mod 'puppet-nginx', '0.11.0'
-
-mod 'sensu-sensu', '2.53.0'
-mod 'puppet-rabbitmq', '8.2.2'
-mod 'arioch-redis', '3.1.0'
-mod 'yelp-uchiwa', '2.0.0'
-mod 'computology-packagecloud', '0.3.2'
-mod 'puppetlabs-gcc', '0.3.0'
-mod 'herculesteam-augeasproviders_core', '2.1.4'
-mod 'herculesteam-augeasproviders_sysctl', '2.2.0'
-
-mod 'puppetlabs-bolt_shim', '0.1.1'
-
-mod 'puppetlabs-reboot', '2.0.0'