Plunkto: Initial refactor into new framework