Updated folder structure for CanvasWrapper and paths to stay consistent
with global naming conventions for project. Also minor bug fixes in
CanvasWrapper.js