Redone structure and makefile