refactored 'core' states into one root