Optimized yaml.
Also reorganized plugin v. library packages.