Fix structure to prepare for subdomains