move class
Merge remote-tracking branch 'origin/danih_5.0_design_branch' into eugen_Maven_Script