reorganise states
locale & shell managment