adapt to new meta Selecto and refactor package