reorganize project.

Goofy project setup that needed to be cleaned up.