Made some changes to the makefiles. Getting second thoughts on how
to organize the whole make structure...