BPC-183: moving packages