Moved header files into src directory