Updates

Changes to the structure of the entire thing