Began to sort out Makefiles more.