Modularized the storage, redis removed