Rename CloudServiceProject to CloudService
Rename Def to Definition