Remove V1 from V2 branch

Remove V1 code from V2 branch and move V2 up