Changed the way apps and pages are added to server so that every Service runs in it's own context (more flexible)