Update Makefile for new layout

This should eventually be replaced with distutils by for now
we should install things in the right places.