removed old stuff
corrected includes to new header file names