VX(Li): Refactor the folder structure to reflect the new naming structure.