major refactoring of code, getting homes in new packages.