clean up dictionary structure, remove most top level entries, move them into proper context and update html pages accordingly