Adjusting source files and header file