Update to latest libsfp and start refactoring
use latest libsfp