Reshape icon directories, and fix Makefile.