fixed with folders and names