New Makefile & directory structure