Removed old references, fixed solution

Moved out most of the old references to the old project.  I'll be moving
to git flow soon, but for the moment I'm just getting it building and
looking like a real project.