Split VCL files to make them more modular