Moving the ServiceContext remote/local under resources