moving basic objects out of demo
moving basic objects out of demo
richer data model
removing old class
random annotation generation using an input tree
minor fixes