Move headers from Public to Project