updated dependency structure
added voodoo & ondemand as modules