Fixed makefile.
Some better organization.