Restructured the classes.
Tested a universal verification with the system setup