Move recent changes to proper place

A few recent commits changed generated files instead of original src, move changes into proper place so that after `make node` nothing is lost