Restructure (no code change really)