Refactored impala into separate state-store and server states