Reorganized screen files