Thesis structure changed