New makefile structure