Moved plugin chunks around