Move Common.Storage into Common folder