Cleaned up some copy-paste poo. Switched some more modules to using the Uize.package method.