Removed and moved a number of partials

and it will probably break the generator until I comb through it
looking for references.