Made some changes to the structure