Moved header files to separate folder