Reorganization. Makefile and setup.py file.