Corrected all the classes and includes accordingly