Moved header files to src directory