Made changes to structure