refactor: home structure
fix: conflict