refactor saphena project