Module restructred
Merge branch 'master' of github.com:yarrait/services_extra7
@todos for Preksha