Did a bit of reordering. Only missing Model.Ant.Loading and the refactor's done