Changed makefile structure