Updating: reorganizing singpolyma-kernel