New Classses

After our meeting, this is how the structure should be like.