Split package into 2 packages
Version up to 1.4