Moved nonDeactivatableFiles and masterFiles