Refactor code, change domain names