Reordered classes, removed a class, and fixed puppet class error via manual LINT