Updated thesis structure