Many more updates and restructuring
Tweaks