Merge branch '2038-move-basops-into-separate-directory-e-g-lib_basop-or-basic_op' into 'main'

Resolve "Move BASOPs into separate directory, e.g. lib_basop or basic_op"

Closes #2038

See merge request !2260