Refactor ResourceServer

Addresses #11 

This will be 0.2 as it introduces a BC.