Deleting classes and ajustig some headers