changed general structure of thesis