Separated Resource class definitions and ordering to fix reported Puppet Syntax errors.