Refactoring of basic canvas data structures into a new model object