Moved Storer interface to separate file. Introduced Retriever interface. Broke apart big methods into smaller pieces.
This was supposed to be in the last commit.