Restructure Makefile for more generic includes and libs