Renamed services to generic names
Added files for services that we havn't had before
Merge pull request #1 from Tehsmash/renamedServices

Renamed services and new services