Did a little reorganizing
More of a start