Split VCL files ro make them more modular