Restructured site to be bilingual
Merge conflict
Fixed merge conflicts