Restructure for scale

All bossed out!