Restructure makefile