massive update cleaning => moving class

Signed-off-by: Daniel Sum <daniel@lacerisenumerique.be>