Makefile: do not use recursion and organize
Version bump ahead of release.