New Cookie Builder implementation
Renamed cookie classes/interfaces