Brought main plugins into main tree