Prefs moved into service

Pretty straightforward in terms of code, more contetious in terms of architecture.