try to rearrange the places and history managment.

git-svn-id: https://svn.apache.org/repos/asf/james/hupa/trunk@1522371 13f79535-47bb-0310-9956-ffa450edef68