Reorganized file setup