Fixed Makefile and included cleanup target.
Moved things around.