Restructuring the project.

svn path=/sandbox/; revision=83200