put a few packages in the right place, and renamed, tweaked doc creation, updated some depending lib versions