Complete move to Model, View, Controller architecture.