Added a new sink type. Changed package structure.