Merge "Moved Session and ViewState to its own classes."