Moved .h files to include directory