Renamed files and refactored
Merge branch 'webservice' of https://github.com/Happyness/social into webservice

merged