Improved splint integration
Unifying to single makefile
Makefile fixes