added Jade, changed folder names to vars