rename package for consistency
automatic source code cleanup
tidy up store package and add/improve unit tests