Moved the multi blocks in the right package