back to puppet:///modules/ urls
moved nodes to their own 'nodes' folder
moved osfamily to their own folder
pruned file locations
renamed java
solved issue of redefined packages
need to include packages module