Code reargue and build system
Missing
Fix build
Simplify Makefile