Continued filescanner restructuring