Updated Rubiks Class Structure

and modified the rest accordingly.