Reorganized project structure.
Merge pull request #1 from lakeslc/project-reorg

Reorganized project structure.