Refactoring of canvas package.