Revert "moving piececontainer"

This reverts commit bb0316abc6163fe05bb5f22daa8795e6ee8c65c3.
fixed