Fixed issues and added subdomain folder