Updated Makefile, split project to more manageable size