ESMStore cleanup

The first pass on making the ESMStore less messy, all stores are now stored in a tuple which can now be retrieved via the type.