Changed folder structure in CanvasWrapper to stay consistent with other parts
of the project