Reset ruhoh to release version
Rearrange Makefile