Shop reorganization part three.