Day 2 Restructure

Tackled by jong overnight