Changed project name to Social
Some more restructuring