Move ViewState to view package