New structure and makefile