Move header files to Public