Move headers to sub directory
Fix gather