Fixed directory tags
Better makefile
Preliminary deadlines and a system to define deadlines