refactored name of demos, of packages, moved pubsub to basic etc..