more plugins plus organizational changes!