I also support a reshuffling of the directories, but not in the cmake branch.  Let that be used JUST for getting cmake up and running and if/once that is merged into trunk, then we look into changing the structure.  Best not to complicate one task by adding more to it.<br>