This broke maple_wink. I have not yet found why this happened.
This is a reshuffling of filenames, extensions, paths, make rules, just because I felt like it.
