Organized code.
Makefile update.