Reorganized file structure to reduce clutter.