Renamed to CSLib, many structure changes