Added flavors and package directories