Rewrote the make files