Split into directories
Fix headers