fixed header file issues. start of new structure.