Move headers to subdir