Cleanup and restructure of exercises.