Separated graph model from LSI model; updated all files; Daniel's test OK