Reorganise directory structure to make things easier to find and maintain.

svn path=/sandbox/; revision=84143