[NUCCORE-1183] Move to more appropriate package