Move headers to subdirectory