Changing links to symlinks to be more explicit
Adding flavors