Initial files (with Makefile edits)