Moved the Canvas class to it's own file