Initial commit of renamed code
Fixing non-fast-forward-error