update repository layout and Makefile