Fixing folder names to match project names
Fixing project references too
Missed infrastructure project the first time
Merge pull request #3 from tsquires/master

Fixing folder names to match project names