Consolidated files and changed settings