Finalize site structure

Finalize site structure