ContentServices update and Cleanup
- added more tests and code for ContentServices
- started to add File services
- general cleanup and moved some entries around