Stores are now accessed by scheme in the uri
- General cleanup