Closed #155 Social Module

Refactoring and close issue