Change naming scheme, add basic Makefile