Fix directory structure
Remove CNAME
Update config