New Version with separate folders