Changed Makefile and structure