re-arrange and start to add bzr