Re-organize and add Riak plugin