Vr refactoring classes