Refactor to the real home structure