OCC and FIles:Scan in single catlog

Btw. you shouldn't modify stuff within the datadir itself. That is unsupported and can cause issues with your data. Please see the following FAQ for alternatives: