Finish integrating HaskellPPL with Main, and rewrite the Makefile