Restructuring so many things, but really making it simpler in the end