reoriganize libraries
change name of viewer struct