CHDK trunk expanded

I were wondering yesterday night what was going on with the chdk trunk. An svn update gave me message that many directories are deleted. Then I  read the check in from the wiki. I realized that some major changes are going to happen. Today svn update gave me more number of directories. Hence my calculations were correct. They were trying to merge the JUVIPHOX branch to the trunk. I haven’t tested the latest one but I have to test it today. I hope things would work. Else it would be yet another cake for me .