Re-organized and created loca_storage
Reorg part 2
Merge commit 'e3a211a58ec2418335a0aefc790d037e7f0234d1'