Moved 'AppState' to model folder