Refactor scene model + added canvas scene