Updating the structure to match the latest guidelines