VX(Li): Refactor the source files.