exercise/solution reorganization