restructured domain files and shortened names