Just added and structured the different classes to be used.