Fixing project setup. Should build cleanly now.
Overall cleanup.