Hopefully fixed the structure now