Organized the Makefile a bit.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
Removed a command I no longer use.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>