Full V2 of the site. Refactoring everything.
objects refactoring for v2
more figure 9 refactoring