update repository layout and Makefile
remove x from names
fix name conflict