revised file structure, added setup.py, added makefile