VX(He): Refactoring the folder structure.