started work on restructering makefile stuff