Restructure all the things. Test all the things.