Fixed Class Including Issue

-Fixed issue of classes using other classes.