Rearchitecture following CreateJS (see #17)