Moved code to branch lib-opencsf