Reorg'd code worked fine. Pulling the basic reorg back to trunk. Next batch of changes won't be so kind :)