Cleaned up makefiles
Added upload to Makefile