Split into separate files; add cname