moving core functionality in a domain folder