Fixing folder names to match project names
Fixing project references too