Make'd Makefile, modularize code and improved mrb support