added pages, global restructioning