Saving progress. Experimenting with directory layout. svn path=/branches/kill-bonobo/; revision=36446