Updates and restructures