Project name & structure fixed.