Change to multi-project build.

Fixed problem with last preq- this time, I used 'git mv', so John should be able to merge without problems.