Consolidate package naming under title "Social".
Add includes.