Remove V2 from V1 branch

Remove V2 code from V1 branch, move V1 code up