Services reorganized
Merge pull request #2 from ndejesus1227/Service-Struct

Services reorganized