Updated dependencies, fixed generated file names to align w/ contained class names