Moved everything into make file