Added in the framework for moveTwoPieces and clean/securing of affected classes