Moved dictionary implementations into a separate package