Extracted Storage into separate package, removed undoredo dependency on SparkMoVare