Updated todo.org
Cleaned up and reorganized Makefile