Various changes

Restructured packages, added demo's for touch and scalableCanvas