Aditi's thesis - this time - with structure