Initial AVM1 refactoring

Using AVM2 objects for all store operations