Crear/merge/big cleanup

Get rid of old code and rename all the *View2 / View_orig to their real names.
This depends on #67