Rearranged everything into v1/v2 and started to map out the relational model for v2