Initial commit
Dir layout and Makefile fixup