Update to header files and removal of old files