Some nice restructuring, and a nice lil' package.json