Moved State into App class