move accounts mapping to it own storage