Realigning & and *, adding two files oddly absent

Realigned & and * to group with the variable name, not the rest of the
type declaration
Added two files that GitHub.app seems to have left out of my previous
commit