Use a Static Service Locator for GroupStorage

Closes #38