Draft of the Website refactoring