Adding make file + more modular
Some changes to emacs